prune_plib_registry: display preserved libs
authorZac Medico <zmedico@gentoo.org>
Sat, 14 May 2011 21:41:22 +0000 (14:41 -0700)
committerZac Medico <zmedico@gentoo.org>
Thu, 26 May 2011 02:47:33 +0000 (19:47 -0700)
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

index db081e127f52772a66755905df36679cece191de..189b47a2e77ef63696f21c7ce51be107806cc3c8 100644 (file)
@@ -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