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 78872bd221f7937b994728f5c52590b7181d2bdc..018263b0ab10fd38c935917dbc44d39fa64c116a 100755 (executable)
--- 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()