Skip to content

Commit

Permalink
Merge pull request #15400 from degano/fix_das_client_75X
Browse files Browse the repository at this point in the history
change das_client.py to das_client in cmsDriver
  • Loading branch information
davidlange6 committed Aug 9, 2016
2 parents 43c9dce + e87a96e commit ba9cc10
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Configuration/Applications/python/ConfigBuilder.py
Expand Up @@ -136,8 +136,8 @@ def filesFromDASQuery(query,option="",s=None):
if count!=0:
print 'Sleeping, then retrying DAS'
time.sleep(100)
p = Popen('das_client.py %s --query "%s"'%(option,query), stdout=PIPE,shell=True)
pipe=p.stdout.read()
p = Popen('das_client %s --query "%s"'%(option,query), stdout=PIPE,shell=True)
pipe=p.stdout.read()
tupleP = os.waitpid(p.pid, 0)
eC=tupleP[1]
count=count+1
Expand Down
4 changes: 2 additions & 2 deletions Configuration/PyReleaseValidation/python/MatrixUtil.py
Expand Up @@ -115,10 +115,10 @@ def das(self, das_options):

# 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.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 = "({0})".format(command)
else:
command = "das_client.py %s --query '%s'" % (das_options, self.queries()[0])
command = "das_client %s --query '%s'" % (das_options, self.queries()[0])

# Run filter on DAS output
if self.ib_blacklist:
Expand Down

0 comments on commit ba9cc10

Please sign in to comment.