From 6b496a0e03bd638b0af69cb6399ae33933438391 Mon Sep 17 00:00:00 2001 From: Francesco Date: Tue, 6 Mar 2018 11:59:27 +0100 Subject: [PATCH] migrating das queries to dasgoclient --- Configuration/Applications/python/ConfigBuilder.py | 2 +- Configuration/PyReleaseValidation/python/MatrixUtil.py | 6 +++--- Configuration/PyReleaseValidation/scripts/runTheMatrix.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py index b33c40d64d063..5cb3f0299be7a 100644 --- a/Configuration/Applications/python/ConfigBuilder.py +++ b/Configuration/Applications/python/ConfigBuilder.py @@ -135,7 +135,7 @@ def filesFromDASQuery(query,option="",s=None): if count!=0: print 'Sleeping, then retrying DAS' time.sleep(100) - p = Popen('das_client %s --query "%s"'%(option,query), stdout=PIPE,shell=True) + p = Popen('dasgoclient %s --query "%s"'%(option,query), stdout=PIPE,shell=True) pipe=p.stdout.read() tupleP = os.waitpid(p.pid, 0) eC=tupleP[1] diff --git a/Configuration/PyReleaseValidation/python/MatrixUtil.py b/Configuration/PyReleaseValidation/python/MatrixUtil.py index 4d0256744e0dc..ed7d588f76a01 100644 --- a/Configuration/PyReleaseValidation/python/MatrixUtil.py +++ b/Configuration/PyReleaseValidation/python/MatrixUtil.py @@ -118,11 +118,11 @@ def das(self, das_options): # take at most 5 queries, to avoid sinking das # do if you have LS queries - # command = ";".join(["das_client.py %s --query '%s'" % (das_options, query) for query in self.queries()[:3] ]) - command = ";".join(["das_client %s --query '%s'" % (das_options, query) for query in self.queries()[:3] ]) + # command = ";".join(["dasgoclient.py %s --query '%s'" % (das_options, query) for query in self.queries()[:3] ]) + command = ";".join(["dasgoclient %s --query '%s'" % (das_options, query) for query in self.queries()[:3] ]) command = "({0})".format(command) else: - command = "das_client %s --query '%s'" % (das_options, self.queries()[0]) + command = "dasgoclient %s --query '%s'" % (das_options, self.queries()[0]) # Run filter on DAS output if self.ib_blacklist: diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index 00f63a7206405..85f4e6ea76a20 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -209,7 +209,7 @@ def runSelected(opt): action='store_true') parser.add_option('--das-options', - help='Options to be passed to das_client.py.', + help='Options to be passed to dasgoclient.py.', dest='dasOptions', default="--limit 0", action='store')