From de98170e5b81e2b1030e3cbb44d83a87f6f3cd68 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 11 Oct 2008 18:51:07 +0000 Subject: Bug #241204 - Fix dbapi.invalidentry() calls inside vardbapi.cpv_all() to correctly join the path via self.getpath(). svn path=/main/trunk/; revision=11676 --- pym/portage/dbapi/vartree.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pym') diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index ac6e10ae3..eae494ada 100644 --- 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 -- cgit v1.2.3-1-g7c22