Merge pull request cms-sw#20 from fruboes/Run2HSCP_v9_tf

Dont hang on qsub call, since it expects input
jozzez1 · Dec 2, 2015 · 0dd3ba3 · 0dd3ba3
2 parents 77b1d74 + f20aff5
commit 0dd3ba3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/SUSYBSMAnalysis/HSCP/python/LaunchOnCondor.py b/SUSYBSMAnalysis/HSCP/python/LaunchOnCondor.py
@@ -383,8 +383,8 @@ def SendCluster_Create(FarmDirectory, JobName):
 
 	#determine what is the submission system available, or use condor
         if(subTool==''):
-  	   if(  commands.getstatusoutput("bjobs")[1].find("command not found")<0): subTool = 'bsub'
-           elif(commands.getstatusoutput("qsub")[1].find("command not found")<0): subTool = 'qsub'
+  	   if(  not commands.getstatusoutput("which bjobs")[1].startswith("which:")): subTool = 'bsub'
+           elif( not commands.getstatusoutput("which qsub")[1].startswith("which:")): subTool = 'qsub'
            else:                                                                   subTool = 'condor'
         if(Jobs_Queue.find('crab')>=0):                                            subTool = 'crab'