Fix stupid bug

svn path=/trunk/packages/sipb-xen-www/; revision=573

diff --git a/code/main.py b/code/main.py
index 073f81d..8a5c178 100755 (executable)
--- 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
         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'):
         oldname = machine.name
 
         if hasattr(validate, 'memory'):

diff --git a/code/validation.py b/code/validation.py
index df5bdcc..a152946 100644 (file)
--- 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):
     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:
     if owner is None:
         raise InvalidInput('owner', owner, "Owner must be specified")
     try: