X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Ffiles%2Fbuildd-schroot-aptitude-kill;h=fa7374642317a8f32bc59f9f57be7d5039cb87af;hb=d94208e70a3ca321373e1f4ba587afa82f919e8e;hp=5e90d77ecc9575d19707a9519b506a09b2782a18;hpb=0637773c599d387da3426ac17d78cc8b0e1c8f90;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/files/buildd-schroot-aptitude-kill b/modules/buildd/files/buildd-schroot-aptitude-kill
index 5e90d77ec..fa7374642 100755
--- a/modules/buildd/files/buildd-schroot-aptitude-kill
+++ b/modules/buildd/files/buildd-schroot-aptitude-kill
@@ -54,10 +54,8 @@ for p in psutil.process_iter():
 		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
+		if used < total_mem and cputime < cutoff_time: continue
 		#
 		p.kill()
 	except psutil.NoSuchProcess: