diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-07-31 18:34:36 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-07-31 18:34:36 +0000 |
| commit | b8bb4d52a54ede6acb0787456dc7f6e3ce36ea50 (patch) | |
| tree | b7aba72cd18d2c4057778a43724f04d2368a2dae /bin/emerge | |
| parent | 29107b92d97a9447719b0bb67b30dce535318f56 (diff) | |
| download | portage-b8bb4d52a54ede6acb0787456dc7f6e3ce36ea50.tar.gz portage-b8bb4d52a54ede6acb0787456dc7f6e3ce36ea50.tar.bz2 portage-b8bb4d52a54ede6acb0787456dc7f6e3ce36ea50.zip | |
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
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 5 |
1 files changed, 4 insertions, 1 deletions
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() |