Merge remote-tracking branch 'stevee/file-update'

[people/ms/ipfire-3.x.git] / pakfire / patches / 0012-Revert-builder-Remove-pids-from-list-of-running-jobs.patch

From 2121826fbbca5ab407bafcd570e668b6c9afd49e Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 5 Feb 2013 22:06:51 +0100
Subject: [PATCH 12/17] Revert "builder: Remove pids from list of running jobs
 when job has finished."

This reverts commit c3319c905d03176308e01175f344cf33bd926113.
---
 python/pakfire/client/builder.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/python/pakfire/client/builder.py b/python/pakfire/client/builder.py
index 2d6280c..9798cc4 100644
--- a/python/pakfire/client/builder.py
+++ b/python/pakfire/client/builder.py
@@ -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
 
-- 
1.8.1.2