X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Ffiles%2Fbuildd-schroot-aptitude-kill;h=07f75c1de2c7c4af8019469027c6d4cce99a5ca7;hb=a3714532f4a134c0c62ee074dbf5bf6b187b83b5;hp=220e9df994c2d1dc6b4460c292360bb489280c2a;hpb=6daebec74370abf74954a830aa40170a0b5f7bf4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/files/buildd-schroot-aptitude-kill b/modules/buildd/files/buildd-schroot-aptitude-kill
index 220e9df99..07f75c1de 100755
--- a/modules/buildd/files/buildd-schroot-aptitude-kill
+++ b/modules/buildd/files/buildd-schroot-aptitude-kill
@@ -30,18 +30,21 @@ total_mem = psutil.phymem_usage().total
 cutoff_time = 60*10
 
 for p in psutil.process_iter():
-	if p.name != 'aptitude': continue
-	parent = p.parent
-	if parent is None: continue
-	if parent.name != 'schroot': continue
-	#
-	rootdir = os.readlink('/proc/%d/root'%(p.pid,))
-	if not rootdir.startswith('/var/lib/schroot/mount'): continue
-	#
-	used = p.get_memory_info().vms
-	if used < total_mem: continue
-	#
-	cputime = p.get_cpu_times().user
-	if cputime < cutoff_time: continue
-	#
-	p.kill()
+	try:
+		if p.name != 'aptitude': continue
+		parent = p.parent
+		if parent is None: continue
+		if parent.name != 'schroot': continue
+		#
+		rootdir = os.readlink('/proc/%d/root'%(p.pid,))
+		if not rootdir.startswith('/var/lib/schroot/mount'): continue
+		#
+		used = p.get_memory_info().vms
+		if used < total_mem: continue
+		#
+		cputime = p.get_cpu_times().user
+		if cputime < cutoff_time: continue
+		#
+		p.kill()
+	except psutil.error.NoSuchProcess:
+		pass