[gentoo-commits] portage r11842 - main/trunk/pym/portage/dbapi

[gentoo-commits] portage r11842 - main/trunk/pym/portage/dbapi

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-11-09 23:02:33 +0000 (Sun, 09 Nov 2008)
New Revision: 11842

Modified:
   main/trunk/pym/portage/dbapi/vartree.py
Log:
* 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.


Modified: main/trunk/pym/portage/dbapi/vartree.py
===================================================================
--- main/trunk/pym/portage/dbapi/vartree.py	2008-11-09 22:36:06 UTC (rev 11841)
+++ main/trunk/pym/portage/dbapi/vartree.py	2008-11-09 23:02:33 UTC (rev 11842)
@@ -2573,7 +2573,7 @@
 		# 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 @@
 				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 @@
 					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: