From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Fri, 20 Jun 2008 01:17:40 +0000 (+0000)
Subject: this is what i really wanted to do.  temporary fix.  this needs to be cleaned up
X-Git-Tag: NodeManager-1.8-0~31
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=bca81591e56ed6b4b550cab7256dc15162c16259

this is what i really wanted to do.  temporary fix.  this needs to be cleaned up
---

diff --git a/sliver_vs.py b/sliver_vs.py
index ef5b6b2..bf293e0 100644
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -106,8 +106,9 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             refname="-".join( (pldistro,fcdistro,arch) )
 
             # check the templates exists -- there's probably a better way..
-            if not (os.path.isdir ("/vservers/.vref/%s"% refname) or 
-            os.path.isdir ("/vservers/.vref/%s"% vref)):
+            if os.path.isdir ("/vservers/.vref/%s"% vref): refname = vref
+
+            if not os.path.isdir ("/vservers/.vref/%s"% refname):
                 logger.verbose("%s (%s) : vref %s not found, using default %s"%(
                         name,vref,refname,default))
                 refname=default