From f1af68e406bba956edb40440f65c5fc8057d6cab Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 9 Nov 2008 23:02:33 +0000 Subject: [PATCH] * Use noiselevel=-1 for preserve-libs ">>> needed" and "<<< !needed" messages so that they're show even without --verbose mode. * Sort files for the ">>> needed" display. svn path=/main/trunk/; revision=11842 --- pym/portage/dbapi/vartree.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 418624598..152e9d2cc 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -2573,7 +2573,7 @@ class dblink(object): # Copy contents entries from the old package to the new one. new_contents = self.getcontents().copy() old_contents = self._installed_instance.getcontents() - for f in list(preserve_paths): + for f in sorted(preserve_paths): f_abs = os.path.join(root, f.lstrip(os.sep)) contents_entry = old_contents.get(f_abs) if contents_entry is None: @@ -2589,7 +2589,8 @@ class dblink(object): continue new_contents[f_abs] = contents_entry obj_type = contents_entry[0] - showMessage(">>> needed %s %s\n" % (obj_type, f_abs)) + showMessage(">>> needed %s %s\n" % (obj_type, f_abs), + noiselevel=-1) # Add parent directories to contents if necessary. parent_dir = os.path.dirname(f_abs) while len(parent_dir) > len(root): @@ -2726,7 +2727,8 @@ class dblink(object): raise del e else: - showMessage("<<< !needed %s %s\n" % (obj_type, obj)) + showMessage("<<< !needed %s %s\n" % (obj_type, obj), + noiselevel=-1) # Remove empty parent directories if possible. while parent_dirs: -- 2.26.2