X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfiprocess.py;h=c5a056b03aba8e99771d5013e9329fdbc5c33c91;hp=ee49eb73cf85b6963d0e92e956639cbb8e2a2f28;hb=c4ae31dd3f7402ab6f6e2f563f887e0e6220c1e0;hpb=dc5a4a16b0819bc27efd1f77d632a76463db82c0 diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py index ee49eb7..c5a056b 100644 --- a/sface/sfiprocess.py +++ b/sface/sfiprocess.py @@ -3,9 +3,6 @@ import os import sys import time -from distutils.version import LooseVersion -from sfa.util.version import version_core - from PyQt4.QtCore import * from sface.config import config from sface.xmlrpcwindow import get_tracker, XmlrpcReader @@ -141,14 +138,10 @@ class SfiProcess(QObject): def listRecords(self, hrn, rectype=None, filename=None): args = ["-u", config.getUser(), "-a", config.getAuthority(), - "-r", config.getRegistry(), "-s", config.getSlicemgr(), "list", hrn] + "-r", config.getRegistry(), "-s", config.getSlicemgr(), "list", "-F", "xmllist", hrn] if not filename: - if LooseVersion(version_core()['code_tag']) <= LooseVersion("1.0-35"): - # DEPRECATED - filename = config.getAuthorityListRecordFile() - else: - filename = config.getAuthorityListFile() + filename = config.getAuthorityListFile() # we can't tell whether SFI will create one file or many, so delete # leftovers from last time, then we'll know what we got, after we get it.