Bug #241204 - Fix dbapi.invalidentry() calls inside vardbapi.cpv_all() to

correctly join the path via self.getpath().

svn path=/main/trunk/; revision=11676

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index ac6e10ae31b32041dcea1a1bc98e89cdc5e3dcb2..eae494ada15ded96ac4865474c0dc99510ab34d4 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -857,10 +857,10 @@ class vardbapi(dbapi):
                                # -MERGING- should never be a cpv, nor should files.
                                try:
                                        if catpkgsplit(subpath) is None:
-                                               self.invalidentry(os.path.join(self.root, subpath))
+                                               self.invalidentry(self.getpath(subpath))
                                                continue
                                except InvalidData:
-                                       self.invalidentry(os.path.join(self.root, subpath))
+                                       self.invalidentry(self.getpath(subpath))
                                        continue
                                returnme.append(subpath)
                return returnme