summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-03-01 20:50:10 +0000
committerZac Medico <zmedico@gentoo.org>2007-03-01 20:50:10 +0000
commitd3b78f4a3226f955085b60fff013ac1e3ea30a86 (patch)
treea85d003f8ff7080194bec5d160314aee09df1364 /bin
parentUse an alarm signal to implement a timeout when rsync is fetching the server ... (diff)
downloadportage-multirepo-d3b78f4a3226f955085b60fff013ac1e3ea30a86.tar.gz
portage-multirepo-d3b78f4a3226f955085b60fff013ac1e3ea30a86.tar.bz2
portage-multirepo-d3b78f4a3226f955085b60fff013ac1e3ea30a86.zip
Make sure pids are appropriately removed from portage_exec.spawned_pids. (trunk r6110:6111)
svn path=/main/branches/2.1.2/; revision=6112
Diffstat (limited to 'bin')
-rwxr-xr-xbin/emerge4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index 95169c14..b56eeb33 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3960,13 +3960,13 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
# This is the same code rsync uses for timeout.
exitcode = 30
else:
- if mypids:
- portage_exec.spawned_pids.remove(mypids[0])
if exitcode != os.EX_OK:
if exitcode & 0xff:
exitcode = (exitcode & 0xff) << 8
else:
exitcode >> 8
+ if mypids:
+ portage_exec.spawned_pids.remove(mypids[0])
if content:
try:
servertimestamp = time.mktime(time.strptime(