Merge branch 'master' of ssh://git.onelab.eu/git/sfa-gui

[sfa-gui.git] / SfaData.py

diff --git a/SfaData.py b/SfaData.py
index 38acb39..aea1ba4 100644 (file)
--- a/SfaData.py
+++ b/SfaData.py
@@ -22,8 +22,8 @@ class SfaData:
     def show(self,classname):
         if SfaData.SFAUI_VERBOSE:
             print "instance of %s after reading config from %s"%(classname,self.filename)
-            for (k,v) in SfaData.__dict__.items():
-                print "%-20s: %r"%(k,v)
+            for (k,v) in SfaData.defaults.items():
+                print "%-20s: %r"%(k,getattr(SfaData,k))
 
     def getAuthority(self):
         return SfaData.SFI_AUTH
@@ -110,7 +110,7 @@ class SfaData:
                  "-r", self.registry(), "-s", self.slicemgr(), "create", slice, filename]
         self.trace_command(command)
         subprocess.call(command)
-        self.trace_en()
+        self.trace_end()
 
 class PlanetLabData(SfaData):
     def __init__(self):