From 6792105073822a6d508ee17e8f792566566b8dda Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 14 May 2011 14:41:22 -0700 Subject: [PATCH] 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(). --- pym/portage/dbapi/vartree.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index db081e127..189b47a2e 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1512,6 +1512,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 -- 2.26.2