diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-07-10 19:40:08 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-07-10 19:40:08 +0000 |
| commit | b67e49f7738286156eb517ae8849b6899a122bc7 (patch) | |
| tree | ebe80aceb2a08f459d29a9a3813695cbe4af45b6 /bin | |
| parent | 69afca2d3bbbfb32376d7c8926389b332af94fc7 (diff) | |
| download | portage-b67e49f7738286156eb517ae8849b6899a122bc7.tar.gz portage-b67e49f7738286156eb517ae8849b6899a122bc7.tar.bz2 portage-b67e49f7738286156eb517ae8849b6899a122bc7.zip | |
Don't call emergelog() from the parallel-fetch process for bug #88837.
svn path=/main/trunk/; revision=3833
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 4 |
1 files changed, 3 insertions, 1 deletions
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() |