Add back cpv_exists check from previous commit.

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 7072ce0c56f51f2dd2c5ef540423117a337555cd..1b13e137135721082496cf7f586f279e66b5d041 100644 (file)
--- 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: