From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 28 Sep 2007 21:52:51 +0000 (-0000)
Subject: Bug #193548 - When scanning for config updates and an error
X-Git-Tag: v2.1.3.16~91
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=32c40a53101e9d6a5065b5c27868455d73d6f2d0;p=portage.git

Bug #193548 - When scanning for config updates and an error
occurs, send find's stdout to /dev/null so that only an
error message is shown. (trunk r7875)

svn path=/main/branches/2.1.2/; revision=7876
---

diff --git a/bin/emerge b/bin/emerge
index 7dc67c8c5..cba9ef5e5 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -4537,11 +4537,13 @@ def chk_updated_cfg_files(target_root, config_protect):
 			else:
 				mycommand = "find '%s' -maxdepth 1 -iname '._cfg????_%s'" % \
 					os.path.split(x.rstrip(os.path.sep))
-			a = commands.getstatusoutput(mycommand + \
-				" ! -iname '.*~' ! -iname '.*.bak' -print0")
+			mycommand += " ! -iname '.*~' ! -iname '.*.bak' -print0"
+			a = commands.getstatusoutput(mycommand)
 			if a[0] != 0:
-				print >> sys.stderr, " " + bad("*")+ \
-					" error scanning '%s': %s" % (x, a[1])
+				sys.stderr.write(" %s error scanning '%s': " % (bad("*"), x))
+				sys.stderr.flush()
+				# Show the error message alone, sending stdout to /dev/null.
+				os.system(mycommand + " 1>/dev/null")
 			else:
 				files = a[1].split('\0')
 				# split always produces an empty string as the last element