From 4fc486b66798618cbab3ecc39ab2e8cda0345f53 Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Thu, 20 Nov 2008 08:44:13 -0500 Subject: [PATCH] Move the autoinstaller disabling code to a more useful location (i.e. so that it'll throw the exception before it creates the VM) svn path=/trunk/packages/invirt-web/; revision=1721 --- code/controls.py | 2 -- code/validation.py | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/controls.py b/code/controls.py index d152627..7b4558e 100644 --- a/code/controls.py +++ b/code/controls.py @@ -43,8 +43,6 @@ def getswap(disksize, memsize): return int(min(disksize / 4, memsize * 1.5)) def lvinstall(machine, autoinstall): - #raise InvalidInput('autoinstall', 'install', - # "The autoinstaller has been temporarily disabled") disksize = machine.disks[0].size memsize = machine.memory swapsize = getswap(disksize, memsize) diff --git a/code/validation.py b/code/validation.py index ecd8b9f..513b431 100644 --- a/code/validation.py +++ b/code/validation.py @@ -66,6 +66,8 @@ class Validate: raise CodeError("Invalid cdrom type '%s'" % cdrom) self.cdrom = cdrom if autoinstall is not None: + #raise InvalidInput('autoinstall', 'install', + # "The autoinstaller has been temporarily disabled") self.autoinstall = Autoinstall.query().get(autoinstall) -- 1.7.9.5