| 1 |
commit: e32d4fc7d06831bc52200d0bef9cedbbdae3d548 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 8 20:19:47 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 8 20:48:51 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e32d4fc7 |
| 7 |
|
| 8 |
Remove obsolete others_in_slot plibs code. |
| 9 |
|
| 10 |
This code dates back to commit 79a2ade5a6cb5a6c2d7ace838a39a634265c5522 |
| 11 |
and the preserve-libs logic was different back then. At that time, the |
| 12 |
dblink._preserve_libs() method would earlier register preserved libs |
| 13 |
for the new package currently being merged, while the vardb entry was |
| 14 |
still a -MERGING- node. Current code does not register preserve_paths |
| 15 |
until later, so this others_in_slot code is obsolete. |
| 16 |
|
| 17 |
--- |
| 18 |
pym/portage/dbapi/vartree.py | 14 ++------------ |
| 19 |
1 files changed, 2 insertions(+), 12 deletions(-) |
| 20 |
|
| 21 |
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py |
| 22 |
index 156defc..7072ce0 100644 |
| 23 |
--- a/pym/portage/dbapi/vartree.py |
| 24 |
+++ b/pym/portage/dbapi/vartree.py |
| 25 |
@@ -1462,7 +1462,7 @@ class dblink(object): |
| 26 |
self.contentscache = pkgfiles |
| 27 |
return pkgfiles |
| 28 |
|
| 29 |
- def _prune_plib_registry(self, unmerge=False, others_in_slot=[], |
| 30 |
+ def _prune_plib_registry(self, unmerge=False, |
| 31 |
needed=None, preserve_paths=None): |
| 32 |
# remove preserved libraries that don't have any consumers left |
| 33 |
plib_registry = self.vartree.dbapi._plib_registry |
| 34 |
@@ -1485,15 +1485,6 @@ class dblink(object): |
| 35 |
if cpv_lib_map: |
| 36 |
self._remove_preserved_libs(cpv_lib_map) |
| 37 |
for cpv, removed in cpv_lib_map.items(): |
| 38 |
- if not self.vartree.dbapi.cpv_exists(cpv): |
| 39 |
- for dblnk in others_in_slot: |
| 40 |
- if dblnk.mycpv == cpv: |
| 41 |
- # This one just got merged so it doesn't |
| 42 |
- # register with cpv_exists() yet. |
| 43 |
- self.vartree.dbapi.removeFromContents( |
| 44 |
- dblnk, removed) |
| 45 |
- break |
| 46 |
- continue |
| 47 |
self.vartree.dbapi.removeFromContents(cpv, removed) |
| 48 |
|
| 49 |
if unmerge: |
| 50 |
@@ -1645,8 +1636,7 @@ class dblink(object): |
| 51 |
showMessage(_("!!! FAILED postrm: %s\n") % retval, |
| 52 |
level=logging.ERROR, noiselevel=-1) |
| 53 |
|
| 54 |
- self._prune_plib_registry(unmerge=True, |
| 55 |
- others_in_slot=others_in_slot, needed=needed, |
| 56 |
+ self._prune_plib_registry(unmerge=True, needed=needed, |
| 57 |
preserve_paths=preserve_paths) |
| 58 |
finally: |
| 59 |
self.vartree.dbapi._bump_mtime(self.mycpv) |
Archives