From d678a204ee408e18f71061a6437ac88db561b5c6 Mon Sep 17 00:00:00 2001
From: Eric Price <ecprice@mit.edu>
Date: Tue, 9 Oct 2007 22:29:20 -0400
Subject: [PATCH] minor bugfix, and check not reusing names.
svn path=/trunk/web/; revision=163
---
templates/main.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/templates/main.py b/templates/main.py
index 36ea239..bf40069 100755
--- a/templates/main.py
+++ b/templates/main.py
@@ -583,7 +583,10 @@ def testDisk(user, disksize, machine=None):
return disksize
def testName(user, name, machine=None):
- return name
+ if Machine.select_by(name=name) == []:
+ return name
+ raise InvalidInput('name', name,
+ "Already taken")
def testHostname(user, hostname, machine):
for nic in machine.nics:
@@ -640,6 +643,7 @@ def modify(user, fields):
transaction.commit()
except:
transaction.rollback()
+ raise
remctl("web", "moveregister", oldname, name)
for disk in machine.disks:
# XXX all disks get the same size on change? Interface doesn't support more.
--
1.7.9.5