diff options
| author | Marius Mauch <genone@gentoo.org> | 2008-04-13 05:36:05 +0000 |
|---|---|---|
| committer | Marius Mauch <genone@gentoo.org> | 2008-04-13 05:36:05 +0000 |
| commit | 231f3ec509e4c234aee5ae95385e3c9d2f458e98 (patch) | |
| tree | 6a5bcc38aa72ee3a251dded4d2bef276c7192f7a | |
| parent | 072df810008debac01416dfec98c3ddc600aff63 (diff) | |
| download | portage-231f3ec509e4c234aee5ae95385e3c9d2f458e98.tar.gz portage-231f3ec509e4c234aee5ae95385e3c9d2f458e98.tar.bz2 portage-231f3ec509e4c234aee5ae95385e3c9d2f458e98.zip | |
fix check for other lib copies to properly exclude the current package
svn path=/main/trunk/; revision=9862
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 4 |
1 files changed, 3 insertions, 1 deletions
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 |