From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 8 May 2011 20:46:40 +0000 (-0700)
Subject: Add back cpv_exists check from previous commit.
X-Git-Tag: v2.2.0_alpha32~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=adbefe1e3c84f4015e7dbcc9aee18b0f10833e4d;p=portage.git

Add back cpv_exists check from previous commit.
---

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: