diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-05-14 14:41:22 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-14 14:41:22 -0700 |
| commit | 1a6f909f838f50f5abadf929d6ff7acf30705fbe (patch) | |
| tree | 381e063645bca15f38892a941b36de426ab7b597 | |
| parent | treewalk: fix plib_collisions with same cpv (diff) | |
| download | portage-1a6f909f838f50f5abadf929d6ff7acf30705fbe.tar.gz portage-1a6f909f838f50f5abadf929d6ff7acf30705fbe.tar.bz2 portage-1a6f909f838f50f5abadf929d6ff7acf30705fbe.zip | |
prune_plib_registry: display preserved libs
Since commit c64d4abee145d083c70273be8fd23bd56dffe7ec, sometimes we
preserve libs for unmerged packages here (bug #286714), so we should
display them like we do in _add_preserve_libs_to_contents().
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 13d9ab220..a7e285cf9 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1510,6 +1510,13 @@ class dblink(object): plib_registry.unregister(self.mycpv, self.settings["SLOT"], counter) if unmerge_preserve: + for path in sorted(unmerge_preserve): + contents_key = self._match_contents(path) + if contents_key is None: + continue + obj_type = self.getcontents()[contents_key][0] + self._display_merge(_(">>> needed %s %s\n") % \ + (obj_type, contents_key), noiselevel=-1) plib_registry.register(self.mycpv, self.settings["SLOT"], counter, unmerge_preserve) # Remove the preserved files from our contents |