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

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

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-07-22 02:02:54 +0000 (Tue, 22 Jul 2008)
New Revision: 11161

Modified:
   main/trunk/pym/portage/dbapi/vartree.py
Log:
Redirect dblink._preserve_libs() messages to the log when in background mode.


Modified: main/trunk/pym/portage/dbapi/vartree.py
===================================================================
--- main/trunk/pym/portage/dbapi/vartree.py	2008-07-22 00:35:17 UTC (rev 11160)
+++ main/trunk/pym/portage/dbapi/vartree.py	2008-07-22 02:02:54 UTC (rev 11161)
@@ -2124,6 +2124,7 @@
 		return False
 
 	def _preserve_libs(self, srcroot, destroot, mycontents, counter, inforoot):
+		showMessage = self._display_merge
 		# read global reverse NEEDED map
 		linkmap = self.vartree.dbapi.linkmap
 		linkmap.rebuild(include_file=os.path.join(inforoot, "NEEDED.ELF.2"))
@@ -2217,9 +2218,11 @@
 			# skip existing files so the 'new' libs aren't overwritten
 			if os.path.exists(os.path.join(srcroot, x.lstrip(os.sep))):
 				continue
-			print "injecting %s into %s" % (x, srcroot)
+			showMessage("injecting %s into %s\n" % (x, srcroot),
+				noiselevel=-1)
 			if not os.path.exists(os.path.join(destroot, x.lstrip(os.sep))):
-				print "%s does not exist so can't be preserved" % x
+				showMessage("%s does not exist so can't be preserved\n" % x,
+					noiselevel=-1)
 				continue
 			mydir = os.path.join(srcroot, os.path.dirname(x).lstrip(os.sep))
 			if not os.path.exists(mydir):