[gentoo-commits] portage r12252 - main/trunk/pym/portage/dbapi

[gentoo-commits] portage r12252 - main/trunk/pym/portage/dbapi

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-12-14 20:50:37 +0000 (Sun, 14 Dec 2008)
New Revision: 12252

Modified:
   main/trunk/pym/portage/dbapi/vartree.py
Log:
Bug #250902 - Inside dblink._find_unused_preserved_libs(), show a warning
instead of raising a KeyError if the preserved libs registry contains a
symlink that points to a lib which is not preserved.


Modified: main/trunk/pym/portage/dbapi/vartree.py
===================================================================
--- main/trunk/pym/portage/dbapi/vartree.py	2008-12-14 20:21:32 UTC (rev 12251)
+++ main/trunk/pym/portage/dbapi/vartree.py	2008-12-14 20:50:37 UTC (rev 12252)
@@ -2734,7 +2734,14 @@
 				unlink_list.update(node.alt_paths)
 			unlink_list = sorted(unlink_list)
 			for obj in unlink_list:
-				cpv = path_cpv_map[obj]
+				cpv = path_cpv_map.get(obj)
+				if cpv is None:
+					# This means that a symlink is in the preserved libs
+					# registry, but the actual lib it points to is not.
+					self._display_merge("!!! symlink to lib is preserved, " + \
+						"but not the lib itself:\n!!! '%s'\n" % (obj,),
+						level=logging.ERROR, noiselevel=-1)
+					continue
 				removed = cpv_lib_map.get(cpv)
 				if removed is None:
 					removed = set()