From: Tony Mack <tmack@cs.princeton.edu>
Date: Tue, 22 Dec 2009 03:26:01 +0000 (+0000)
Subject: added force option for get_credential()
X-Git-Tag: sfa-0.9-7~87
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1162fde2cf893467d9728273ef04d4dae4a4761c;p=sfa.git

added force option for get_credential()
---

diff --git a/sfa/server/sfa_component_setup.py b/sfa/server/sfa_component_setup.py
index b8b21301..6feaf562 100755
--- a/sfa/server/sfa_component_setup.py
+++ b/sfa/server/sfa_component_setup.py
@@ -75,7 +75,7 @@ def create_server_keypair(keyfile=None, certfile=None, hrn="component", verbose=
     cert.sign()
     cert.save_to_file(certfile, save_parents=True)       
         
-def get_credential(registry=None, verbose=False):
+def get_credential(registry=None, force=False, verbose=False):
     config = Config()
     hierarchy = Hierarchy()
     key_dir= hierarchy.basedir
@@ -83,7 +83,7 @@ def get_credential(registry=None, verbose=False):
     config_dir = config.config_path
     credfile = data_dir + os.sep + 'node.cred'
     # check for existing credential
-    if os.path.exists(credfile):
+    if not force and os.path.exists(credfile):
         if verbose:
             print "Loading Credential from %(credfile)s " % locals()  
         cred = Credential(filename=credfile).save_to_string(save_parents=True)