From 8a607fa34be43abaa565bb01467870740c6843c1 Mon Sep 17 00:00:00 2001 From: Eric Price Date: Mon, 2 Jun 2008 23:30:01 -0400 Subject: [PATCH] Fix stupid bug svn path=/trunk/packages/sipb-xen-www/; revision=573 --- code/main.py | 1 - code/validation.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/main.py b/code/main.py index 073f81d..8a5c178 100755 --- a/code/main.py +++ b/code/main.py @@ -357,7 +357,6 @@ def modifyDict(username, state, fields): kws = dict([(kw, fields.getfirst(kw)) for kw in 'machine_id owner admin contact name memory vmtype disksize'.split()]) validate = validation.Validate(username, state, **kws) machine = validate.machine - print >> sys.stderr, machine, machine.administrator, kws['admin'] oldname = machine.name if hasattr(validate, 'memory'): diff --git a/code/validation.py b/code/validation.py index df5bdcc..a152946 100644 --- a/code/validation.py +++ b/code/validation.py @@ -227,7 +227,7 @@ def testOwner(user, owner, machine=None): if owner == user: return owner if machine is not None and owner in (machine.owner, None): - return None + return machine.owner if owner is None: raise InvalidInput('owner', owner, "Owner must be specified") try: -- 1.7.9.5