X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sfa%2Fclient%2Fsfi.py;h=8793da37c1b5ae6ec58e72f898e420e3857b4737;hb=67f861014762520ed468b01c62556280a8851f75;hp=2f8a2a8ff18c3f843c25e6e267eff855b76b700c;hpb=0cc524b0816203ed36589fa68337f9291fad0b7b;p=sfa.git diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 2f8a2a8f..8793da37 100644 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -1493,8 +1493,9 @@ $ sfi myslice $ sfi -v myslice -- or sfi -vv myslice same but with more and more verbosity -$ sfi m +$ sfi m -b http://mymanifold.foo.com:7080/ is synonym to sfi myslice as no other command starts with an 'm' + and uses a custom backend for this one call """ ) # register_command def myslice (self, options, args): @@ -1518,13 +1519,13 @@ $ sfi m # (a) rain check for sufficient config in sfi_config myslice_dict={} - myslice_keys=['backend', 'delegate', 'platform', 'username'] + myslice_keys=[ 'backend', 'delegate', 'platform', 'username'] for key in myslice_keys: value=None # oct 2013 - I'm finding myself juggling with config files # so a couple of command-line options can now override config - if hasattr(args,key): - value=getattr(args,key) + if hasattr(options,key) and getattr(options,key) is not None: + value=getattr(options,key) else: full_key="MYSLICE_" + key.upper() value=getattr(self.config_instance,full_key,None)