summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-03-01 20:49:33 +0000
committerZac Medico <zmedico@gentoo.org>2007-03-01 20:49:33 +0000
commite7baec5dbb05234002beabf7d4ce5d1eaf987b6c (patch)
tree3056bc50a33da5f1a4d4203103a7ed791ba5abc8 /pym
parent5cb9305ebe767b4cfa09f85999c25377a00f9ef3 (diff)
downloadportage-e7baec5dbb05234002beabf7d4ce5d1eaf987b6c.tar.gz
portage-e7baec5dbb05234002beabf7d4ce5d1eaf987b6c.tar.bz2
portage-e7baec5dbb05234002beabf7d4ce5d1eaf987b6c.zip
Make sure pids are appropriately removed from portage.process.spawned_pids.
svn path=/main/trunk/; revision=6111
Diffstat (limited to 'pym')
-rw-r--r--pym/emerge/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 1486f4c5e..5ecba4aa8 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -4020,13 +4020,13 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
# This is the same code rsync uses for timeout.
exitcode = 30
else:
- if mypids:
- portage.process.spawned_pids.remove(mypids[0])
if exitcode != os.EX_OK:
if exitcode & 0xff:
exitcode = (exitcode & 0xff) << 8
else:
exitcode >> 8
+ if mypids:
+ portage.process.spawned_pids.remove(mypids[0])
if content:
try:
servertimestamp = time.mktime(time.strptime(