From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 31 Jul 2006 18:34:36 +0000 (-0000)
Subject: Don't call emergelog() from the parallel-fetch process for bug #88837.  This patch... 
X-Git-Tag: v2.1-r2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b8bb4d52a54ede6acb0787456dc7f6e3ce36ea50;p=portage.git

Don't call emergelog() from the parallel-fetch process for bug #88837.  This patch is from trunk r3833.

svn path=/main/branches/2.1/; revision=4070
---

diff --git a/bin/emerge b/bin/emerge
index 3f7d6b944..078848896 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -484,9 +484,12 @@ def emergelog(mystr,short_msg=None):
 			print "emergelog():",e
 		pass
 
+# This hack prevents parallel-fetch from confusing emerge.log parsers.
+emerge_pid = os.getpid()
 def emergeexit():
 	"""This gets out final log message in before we quit."""
-	if "--pretend" not in myopts:
+	global emerge_pid
+	if "--pretend" not in myopts and emerge_pid == os.getpid():
 		emergelog(" *** terminating.")
 	if "notitles" not in portage.settings.features:
 		xtermTitleReset()