diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-10-11 18:51:07 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-10-11 18:51:07 +0000 |
| commit | de98170e5b81e2b1030e3cbb44d83a87f6f3cd68 (patch) | |
| tree | 0a953eae48f361f6864af00a679dc7a41865a09e | |
| parent | 44b31cc1d053d427591155a57bc091de907723f2 (diff) | |
| download | portage-de98170e5b81e2b1030e3cbb44d83a87f6f3cd68.tar.gz portage-de98170e5b81e2b1030e3cbb44d83a87f6f3cd68.tar.bz2 portage-de98170e5b81e2b1030e3cbb44d83a87f6f3cd68.zip | |
Bug #241204 - Fix dbapi.invalidentry() calls inside vardbapi.cpv_all() to
correctly join the path via self.getpath().
svn path=/main/trunk/; revision=11676
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 |