| 1 |
Author: zmedico |
| 2 |
Date: 2008-10-11 18:51:07 +0000 (Sat, 11 Oct 2008) |
| 3 |
New Revision: 11676 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
Bug #241204 - Fix dbapi.invalidentry() calls inside vardbapi.cpv_all() to |
| 9 |
correctly join the path via self.getpath(). |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-10-11 15:49:30 UTC (rev 11675) |
| 15 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-10-11 18:51:07 UTC (rev 11676) |
| 16 |
@@ -857,10 +857,10 @@ |
| 17 |
# -MERGING- should never be a cpv, nor should files. |
| 18 |
try: |
| 19 |
if catpkgsplit(subpath) is None: |
| 20 |
- self.invalidentry(os.path.join(self.root, subpath)) |
| 21 |
+ self.invalidentry(self.getpath(subpath)) |
| 22 |
continue |
| 23 |
except InvalidData: |
| 24 |
- self.invalidentry(os.path.join(self.root, subpath)) |
| 25 |
+ self.invalidentry(self.getpath(subpath)) |
| 26 |
continue |
| 27 |
returnme.append(subpath) |
| 28 |
return returnme |
Archives