From 3a5dbc7ac1a3ef5ed2301a256e2098908522d447 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 21 Mar 2008 21:09:39 +0000 Subject: [PATCH] fixed a couple remaining issues, seems to work --- sliver_vs.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sliver_vs.py b/sliver_vs.py index f1c381e..2f83543 100644 --- a/sliver_vs.py +++ b/sliver_vs.py @@ -80,7 +80,7 @@ class Sliver_VS(accounts.Account, vserver.VServer): # so we could take planetflow as the pldistro part here as_is=None # defaults - default=file("/etc/planetlab/defaultvref").read() + default=file("/etc/planetlab/defaultvref").read().strip() (pldistro,fcdistro,arch) = default.split("-") # from the slice attribute: cut dashes and try to figure the meaning slice_wishes = vref.split("-") @@ -101,12 +101,12 @@ 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): - log.verbose("%s (%s) : vref %s not found, using default %s"%( + logger.verbose("%s (%s) : vref %s not found, using default %s"%( name,vref,refname,default)) refname=default except IOError: # have not found defaultvref - logger.verbose("%s (%s): using fallback vrefname 'default'"%(name,vref)) + logger.verbose("%s (%s): legacy node - using fallback vrefname 'default'"%(name,vref)) # for legacy nodes refname="default" except: -- 2.43.0