Specify full filename path; don't rely on default behavior of sfi.py

[sfa-gui.git] / SfaData.py

diff --git a/SfaData.py b/SfaData.py
index 117c06d..c0bdf5b 100644 (file)
--- a/SfaData.py
+++ b/SfaData.py
@@ -60,10 +60,13 @@ class SfaData:
         slice = self.getSlice()
         # Write RSpec to file for testing.
         filename = os.path.expanduser("~/.sfi/" + slice + ".rspec")
-        os.remove(filename)
+        try:
+            os.remove(filename)
+        except:
+            pass
         call(["sfi.py", "-u", self.getUser(), "-a", self.getAuthority(), 
               "-r", self.registry, "-s", self.slicemgr, "resources", 
-              "-o", slice, slice])
+              "-o", filename, slice])
         f = open(filename, "r")
         xml = f.read()
         f.close()
@@ -72,7 +75,6 @@ class SfaData:
     def applyRSpec(self, xml):
         slice = self.getSlice()
         filename = os.path.expanduser("~/.sfi/" + slice + ".rspec")
-        os.remove(filename)
         f = open(filename, "w")
         f.write(xml)
         f.close()