From 231f3ec509e4c234aee5ae95385e3c9d2f458e98 Mon Sep 17 00:00:00 2001 From: Marius Mauch Date: Sun, 13 Apr 2008 05:36:05 +0000 Subject: [PATCH] fix check for other lib copies to properly exclude the current package svn path=/main/trunk/; revision=9862 --- pym/portage/dbapi/vartree.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 2f8ced89f..cba96cacd 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1603,8 +1603,10 @@ class dblink(object): for lib in list(preserve_libs): if not has_external_consumers(lib, old_contents, preserve_libs): preserve_libs.remove(lib) + # only preserve the lib if there is no other copy in the search path for path in getlibpaths(): - if os.path.exists(os.path.join(path, lib)): + fullname = os.path.join(path, lib) + if fullname not in old_contents and os.path.exists(fullname): preserve_libs.remove(lib) # get the real paths for the libs -- 2.26.2