]> git.ipfire.org Git - people/stevee/pakfire.git/commitdiff
Revert "builder: Remove pids from list of running jobs when job has finished."
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 Feb 2013 21:06:51 +0000 (22:06 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 Feb 2013 21:06:51 +0000 (22:06 +0100)
This reverts commit c3319c905d03176308e01175f344cf33bd926113.

python/pakfire/client/builder.py

index 2d6280cc47a5c682ff2e82279e51339c3310b3b3..9798cc48e3e413d0ac2b929c59089306b5650e5c 100644 (file)
@@ -251,8 +251,6 @@ class PakfireDaemon(object):
 
                                        # Finally, remove the process from the process list.
                                        self.processes.remove(process)
-                                       if self.pid2jobid.has_key(process.id):
-                                               del self.pid2jobid[process.id]
 
                        return ret
 
@@ -276,6 +274,7 @@ class PakfireDaemon(object):
                        for process in self.processes[:]:
                                job_id = self.pid2jobid.get(process.pid, None)
                                if job_id and job_id in aborted_jobs:
+
                                        # Kill the process.
                                        log.info("Killing process %s which was aborted by the user." \
                                                % process.pid)
@@ -284,8 +283,6 @@ class PakfireDaemon(object):
                                        # Remove the process from the process list to avoid
                                        # that is will be cleaned up in the normal way.
                                        self.processes.remove(process)
-                                       if self.pid2jobid.has_key(process.id):
-                                               del self.pid2jobid[process.id]
 
                        return True