*** dpm/dpm-listspaces.prev 2014-03-28 15:36:27.000000000 +0100
--- dpm/dpm-listspaces  2014-04-09 16:30:35.962651800 +0200
***************
*** 46,51 ****
--- 46,52 ----
  import socket
  import re
  import subprocess
+ import signal
  from optparse import OptionParser
  from time import strftime, gmtime
  
***************
*** 805,812 ****
            self.interface['webdav'] = params
            self.access['webdav'] = { 'port': webdav, 'version': self.version, 'security': 'GSI' }
        if xroot:
!         xrootd_query,error = subprocess.Popen("xrdfs "+socket.getfqdn()+" query stats p",shell=True,
!             stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
          if error:
              xrootd_version = 'None'
          else:
--- 806,819 ----
            self.interface['webdav'] = params
            self.access['webdav'] = { 'port': webdav, 'version': self.version, 'security': 'GSI' }
        if xroot:
!         pro = subprocess.Popen("xrdfs "+socket.getfqdn()+" query stats p",shell=True,
!             stdout=subprocess.PIPE, stderr=subprocess.PIPE, preexec_fn=os.setsid)
!         xrootd_query = pro.stdout.readline()
!         try:
!           os.killpg(pro.pid, signal.SIGKILL)
!         except:
!           pass
!         error = pro.communicate()[1]
          if error:
              xrootd_version = 'None'
          else:
***************
*** 1006,1012 ****
          security = 'unset'
          
        for glue_version in glue_versions:
!         if glue_version == 'v1':
            print "dn: GlueSEAccessProtocolLocalID="+protocol_localid+",GlueSEUniqueID="+self.name+",mds-vo-name=resource,o=grid\n" + \
                  "objectClass: GlueTop\n" + \
                  "objectClass: GlueSEAccessProtocol\n" + \
--- 1013,1019 ----
          security = 'unset'
          
        for glue_version in glue_versions:
!         if glue_version == 'v1' and protocol not in ['webdav', 'xrootd']:
            print "dn: GlueSEAccessProtocolLocalID="+protocol_localid+",GlueSEUniqueID="+self.name+",mds-vo-name=resource,o=grid\n" + \
                  "objectClass: GlueTop\n" + \
                  "objectClass: GlueSEAccessProtocol\n" + \