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

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

diff --git a/bin/emerge b/bin/emerge
index 3f7d6b94430324d1d77269f92339af008d4e838b..0788488968044991d20ff88bb557a9323fcc18ad 100755 (executable)
--- 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()