Merge pull request #15410 from degano/fix_das_client_53X

Pick up the wrapper for das_client.py.
cms-sw · Aug 10, 2016 · 2251bc1 · 2251bc1
2 parents d2460a3 + 4068401
commit 2251bc1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Configuration/PyReleaseValidation/python/ConfigBuilder.py b/Configuration/PyReleaseValidation/python/ConfigBuilder.py
@@ -117,7 +117,7 @@ def filesFromDASQuery(query,s=None):
 	prim=[]
 	sec=[]
 	print "the query is",query
-	for line in os.popen('das_client.py --query "%s"'%(query)):
+	for line in os.popen('das_client --query "%s"'%(query)):
 		if line.count(".root")>=2:
 			#two files solution...
 			entries=line.replace("\n","").split()

diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -58,10 +58,10 @@ def das(self):
         query_by = "block" if self.ib_block else "dataset"
         query_source = "{0}#{1}".format(self.dataSet, self.ib_block) if self.ib_block else self.dataSet
         if len(self.run) is not 0:
-            command = ";".join(["das_client.py --limit=0 --query 'file {0}={1} run={2}'".format(query_by, query_source, query_run) for query_run in self.run])
+            command = ";".join(["das_client --limit=0 --query 'file {0}={1} run={2}'".format(query_by, query_source, query_run) for query_run in self.run])
             command = "({0})".format(command)
         else:
-            command = "das_client.py --limit=0 --query 'file {0}={1} site=T2_CH_CERN'".format(query_by, query_source)
+            command = "das_client --limit=0 --query 'file {0}={1} site=T2_CH_CERN'".format(query_by, query_source)
 
         # Run filter on DAS output
         if self.ib_blacklist: