ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CRAB/python/SchedulerGlite.py
(Generate patch)

Comparing COMP/CRAB/python/SchedulerGlite.py (file contents):
Revision 1.18 by mcinquil, Wed Oct 3 16:31:25 2007 UTC vs.
Revision 1.20 by mcinquil, Fri Oct 5 12:09:51 2007 UTC

# Line 56 | Line 56 | class SchedulerGlite(SchedulerEdg):
56              concString = '&&'
57              for ce in ce_white_list:
58                  tmpCe.append('RegExp("' + string.strip(ce) + '", other.GlueCEUniqueId)')
59 <            if len(tmpCe): req = req + " && (" + concString.join(tmpCe) + ") "
59 >            ### MATTY' FIX: if more then one CE: && -> ||
60 >            #print "list CE: " + str(tmpCe)
61 >            if len(tmpCe) == 1:
62 >                req +=  " && (" + concString.join(tmpCe) + ") "
63 >            elif len(tmpCe) > 1:
64 >                firstCE = 0
65 >                for reqTemp in tmpCe:
66 >                    #print reqTemp
67 >                    if firstCE == 0:
68 >                        #print "adding: "+str(" && ( (" + reqTemp + ") ")
69 >                        req += " && ( (" + reqTemp + ") "
70 >                        firstCE = 1
71 >                    elif firstCE > 0:
72 >                        #print "adding: "+str(" || (" + reqTemp + ") ")
73 >                        req += " || (" + reqTemp + ") "
74 >                if firstCE > 0:
75 >                    req += ") "
76 >            ## old code
77 > #            if len(tmpCe): req = req + " && (" + concString.join(tmpCe) + ") "
78          
79          if self.EDG_ce_black_list:
80              ce_black_list = string.split(self.EDG_ce_black_list,',')
# Line 134 | Line 152 | class SchedulerGlite(SchedulerEdg):
152          txt += '    echo "middleware =$middleware" \n'
153          txt += 'elif [ $GRID3_APP_DIR ]; then\n'
154          txt += '    middleware=OSG \n'
155 <        txt += '    echo "SyncCE=`echo $EDG_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
155 >        txt += '    echo "SyncCE=`echo $GLITE_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
156          txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
157          txt += '    echo "middleware =$middleware" \n'
158          txt += 'elif [ $OSG_APP ]; then \n'
159          txt += '    middleware=OSG \n'
160 <        txt += '    echo "SyncCE=`echo $EDG_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
160 >        txt += '    echo "SyncCE=`echo $GLITE_WL_LOG_DESTINATION`" | tee -a $RUNTIME_AREA/$repo \n'
161          txt += '    echo "GridFlavour=`echo $middleware`" | tee -a $RUNTIME_AREA/$repo \n'
162          txt += '    echo "middleware =$middleware" \n'
163          txt += 'else \n'
# Line 268 | Line 286 | class SchedulerGlite(SchedulerEdg):
286  
287      def submitTout(self, list):
288          return 180
271 –

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines