From a6a2113eb2f15ba527a4dc3f27dac6dacefeefb9 Mon Sep 17 00:00:00 2001 From: Eric Price Date: Fri, 7 Mar 2008 13:19:36 -0500 Subject: [PATCH] Fix bug resulting from partial uptimes list from r261 svn path=/trunk/web/; revision=277 --- validation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/validation.py b/validation.py index 3ed4938..fd2b979 100644 --- a/validation.py +++ b/validation.py @@ -43,7 +43,7 @@ def maxMemory(user, machine=None, on=True): if not on: return MAX_MEMORY_SINGLE machines = getMachinesByOwner(user, machine) - active_machines = [x for x in machines if g.uptimes[x]] + active_machines = [x for x in machines if g.uptimes.get(x)] mem_usage = sum([x.memory for x in active_machines if x != machine]) return min(MAX_MEMORY_SINGLE, MAX_MEMORY_TOTAL-mem_usage) @@ -55,7 +55,7 @@ def maxDisk(user, machine=None): def cantAddVm(user): machines = getMachinesByOwner(user) - active_machines = [x for x in machines if g.uptimes[x]] + active_machines = [x for x in machines if g.uptimes.get(x)] if len(machines) >= MAX_VMS_TOTAL: return 'You have too many VMs to create a new one.' if len(active_machines) >= MAX_VMS_ACTIVE: -- 1.7.9.5