From b8bb4d52a54ede6acb0787456dc7f6e3ce36ea50 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 31 Jul 2006 18:34:36 +0000 Subject: 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 --- bin/emerge | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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() -- cgit v1.2.3-1-g7c22