From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 10 Jul 2006 19:40:08 +0000 (-0000)
Subject: Don't call emergelog() from the parallel-fetch process for bug #88837.
X-Git-Tag: v2.1.1~246
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b67e49f7738286156eb517ae8849b6899a122bc7;p=portage.git

Don't call emergelog() from the parallel-fetch process for bug #88837.

svn path=/main/trunk/; revision=3833
---

diff --git a/bin/emerge b/bin/emerge
index 78872bd22..018263b0a 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3826,9 +3826,11 @@ def emerge_main():
 	signal.signal(signal.SIGINT, emergeexitsig)
 	signal.signal(signal.SIGTERM, emergeexitsig)
 
+	# 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:
+		if "--pretend" not in myopts and emerge_pid == os.getpid():
 			emergelog(xterm_titles, " *** terminating.")
 		if "notitles" not in settings.features:
 			xtermTitleReset()