Make sure pids are appropriately removed from portage_exec.spawned_pids. (trunk r6110...

svn path=/main/branches/2.1.2/; revision=6112

diff --git a/bin/emerge b/bin/emerge
index 95169c14bb9fab856a327a622e636697bd7662fe..b56eeb3303398ccab0f789484877c334b3e37cff 100755 (executable)
--- 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(