From: smbaker <smbaker@fc8clean.lan>
Date: Mon, 21 Nov 2011 22:03:20 +0000 (-0800)
Subject: Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa
X-Git-Tag: sfa-2.0-1~8
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=0dc36703e0e611113d310d2b2a8e51210576bcc5;hp=11156a540daa4b6ac2f6348f31f5f0d850161b2b

Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa
---

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index b937febb..64bc550b 100755
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -942,7 +942,9 @@ class Sfi:
         user_cred = self.get_user_cred().save_to_string(save_parents=True)
         server = self.slicemgr
         server = self.server_proxy_from_opts(opts)
-        
+
+        options = {}
+
         if args:
             cred = self.get_slice_cred(args[0]).save_to_string(save_parents=True)
             hrn = args[0]
@@ -950,7 +952,7 @@ class Sfi:
         else:
             cred = user_cred
             hrn = None
-     
+
         creds = [cred]
         if opts.delegate:
             delegated_cred = self.delegate_cred(cred, get_authority(self.authority))
@@ -972,7 +974,7 @@ class Sfi:
         call_args = [creds]
         if self.server_supports_options_arg(server):
             options = {'call_id': unique_call_id()}
-            call_args.append(options)
+        call_args.append(options)
         result = server.ListResources(*call_args)
         if opts.file is None:
             display_rspec(result, opts.format)