summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-05-08 13:46:40 -0700
committerZac Medico <zmedico@gentoo.org>2011-05-08 13:46:40 -0700
commitadbefe1e3c84f4015e7dbcc9aee18b0f10833e4d (patch)
tree2fd24ccd381e5723abaf8d2cf275f4801c6f0dda
parent3a68bf5dff34a8e5e991778c1e28a3a6dda4d141 (diff)
downloadportage-adbefe1e3c84f4015e7dbcc9aee18b0f10833e4d.tar.gz
portage-adbefe1e3c84f4015e7dbcc9aee18b0f10833e4d.tar.bz2
portage-adbefe1e3c84f4015e7dbcc9aee18b0f10833e4d.zip
Add back cpv_exists check from previous commit.
-rw-r--r--pym/portage/dbapi/vartree.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index b4e231e55..a34f1ec01 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1485,6 +1485,8 @@ class dblink(object):
if cpv_lib_map:
self._remove_preserved_libs(cpv_lib_map)
for cpv, removed in cpv_lib_map.items():
+ if not self.vartree.dbapi.cpv_exists(cpv):
+ continue
self.vartree.dbapi.removeFromContents(cpv, removed)
if unmerge: