summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-05-08 13:19:47 -0700
committerZac Medico <zmedico@gentoo.org>2011-05-08 13:19:47 -0700
commit3a68bf5dff34a8e5e991778c1e28a3a6dda4d141 (patch)
tree4dba9b118d61938ba8446d85069b0c24bbee6e95
parentf2091f05a0a5bf495098fcb58ea6912732c1c5a6 (diff)
downloadportage-3a68bf5dff34a8e5e991778c1e28a3a6dda4d141.tar.gz
portage-3a68bf5dff34a8e5e991778c1e28a3a6dda4d141.tar.bz2
portage-3a68bf5dff34a8e5e991778c1e28a3a6dda4d141.zip
Remove obsolete others_in_slot plibs code.
This code dates back to commit 79a2ade5a6cb5a6c2d7ace838a39a634265c5522 and the preserve-libs logic was different back then. At that time, the dblink._preserve_libs() method would earlier register preserved libs for the new package currently being merged, while the vardb entry was still a -MERGING- node. Current code does not register preserve_paths until later, so this others_in_slot code is obsolete.
-rw-r--r--pym/portage/dbapi/vartree.py14
1 files changed, 2 insertions, 12 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 28b67f0e6..b4e231e55 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1462,7 +1462,7 @@ class dblink(object):
self.contentscache = pkgfiles
return pkgfiles
- def _prune_plib_registry(self, unmerge=False, others_in_slot=[],
+ def _prune_plib_registry(self, unmerge=False,
needed=None, preserve_paths=None):
# remove preserved libraries that don't have any consumers left
plib_registry = self.vartree.dbapi._plib_registry
@@ -1485,15 +1485,6 @@ 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):
- for dblnk in others_in_slot:
- if dblnk.mycpv == cpv:
- # This one just got merged so it doesn't
- # register with cpv_exists() yet.
- self.vartree.dbapi.removeFromContents(
- dblnk, removed)
- break
- continue
self.vartree.dbapi.removeFromContents(cpv, removed)
if unmerge:
@@ -1664,8 +1655,7 @@ class dblink(object):
showMessage(_("!!! FAILED postrm: %s\n") % retval,
level=logging.ERROR, noiselevel=-1)
- self._prune_plib_registry(unmerge=True,
- others_in_slot=others_in_slot, needed=needed,
+ self._prune_plib_registry(unmerge=True, needed=needed,
preserve_paths=preserve_paths)
finally:
self.vartree.dbapi._bump_mtime(self.mycpv)