X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfidata.py;h=0adda24850d8b0ed6d3a2fe18ebf82e80cbd71b8;hp=4f2749ee3cfc7837a788277737f0c768272c85df;hb=aa388923ed3dd6bbf8e5b14d52a613c4f374da7a;hpb=480ff8b34640f125528b4a008c031eff8d232135 diff --git a/sface/sfidata.py b/sface/sfidata.py index 4f2749e..0adda24 100644 --- a/sface/sfidata.py +++ b/sface/sfidata.py @@ -80,9 +80,11 @@ class SfiData: rspec_file = config.getSliceRSpecFile() if os.path.exists(rspec_file): xml = open(rspec_file).read() - rspec = RSpec(rspec=xml) #rspec = parse_rspec(xml) - #self.purgeNonSliceResources(rspec) + if (xml.strip()==""): + return None + + rspec = RSpec(rspec=xml) return rspec return None @@ -91,7 +93,11 @@ class SfiData: rspec_file = config.getResourcesRSpecFile() if os.path.exists(rspec_file): xml = open(rspec_file).read() - rspec = RSpec(rspec=xml) #rspec= parse_rspec(xml) + + if (xml.strip()==""): + return None + + rspec = RSpec(rspec=xml) return rspec return None @@ -99,6 +105,9 @@ class SfiData: if not slice: slice = config.getSlice() + if not slice: + return None + filename = config.fullpath(slice+".sliverstatus") if os.path.exists(filename):