From: Fabian Groffen Date: Fri, 11 Apr 2008 11:27:18 +0000 (-0000) Subject: Revert commit -r972{7,8} in Prefix. It indeed fixes bug #215242, but by X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5e71d0871781b3d6e1a2c0be6630dad643890f06;p=portage.git Revert commit -r972{7,8} in Prefix. It indeed fixes bug #215242, but by entirely disabling preserve-libs, which is undesirable for me. svn path=/main/branches/prefix/; revision=9831 --- diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 59062eed1..cc1db12fb 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -16,7 +16,7 @@ from portage.output import bold, red, green from portage.update import fixdbentries from portage.util import apply_secpass_permissions, ConfigProtect, ensure_dirs, \ writemsg, writemsg_stdout, write_atomic, atomic_ofstream, writedict, \ - grabfile, grabdict, normalize_path, new_protect_filename, getlibpaths + grabfile, grabdict, normalize_path, new_protect_filename from portage.versions import pkgsplit, catpkgsplit, catsplit, best, pkgcmp from portage import listdir, dep_expand, flatten, key_expand, \ @@ -1639,10 +1639,7 @@ class dblink(object): for lib in list(preserve_libs): if not has_external_consumers(lib, old_contents, preserve_libs): - preserve_libs.remove(lib) - for path in getlibpaths(): - if os.path.exists(os.path.join(path, lib)): - preserve_libs.remove(lib) + preserve_libs.remove(lib) # get the real paths for the libs preserve_paths = [x for x in old_contents if os.path.basename(x) in preserve_libs]