buildds: kill aptitude after 10 minutes OR all RAM used

[dsa-puppet.git] / modules / buildd / files / buildd-schroot-aptitude-kill

diff --git a/modules/buildd/files/buildd-schroot-aptitude-kill b/modules/buildd/files/buildd-schroot-aptitude-kill
index 5e90d77ecc9575d19707a9519b506a09b2782a18..fa7374642317a8f32bc59f9f57be7d5039cb87af 100755 (executable)
--- 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: