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.9 by spiga, Fri Nov 17 15:28:47 2006 UTC vs.
Revision 1.11 by spiga, Sat Jan 20 13:47:46 2007 UTC

# Line 44 | Line 44 | class SchedulerGlite(SchedulerEdg):
44    
45          req = ''
46          req = req + jbt.getRequirements()
47 <    
47 >  
48 >  
49          if self.EDG_requirements:
50              if (req == ' '):
51                  req = req + self.EDG_requirements
# Line 71 | Line 72 | class SchedulerGlite(SchedulerEdg):
72                  else:
73                      req = req +  ' && (!RegExp("' + string.strip(ce) + '", other.GlueCEUniqueId))'
74                  pass
75 +        
76 +
77          if self.EDG_clock_time:
78              if (req == ' '):
79                  req = req + 'other.GlueCEPolicyMaxWallClockTime>='+self.EDG_clock_time
# Line 90 | Line 93 | class SchedulerGlite(SchedulerEdg):
93              itr4=self.findSites_(first[i])
94              reqSites=''
95              reqtmp=[]  
93 –            j = 0
96              concString = '||'
97              for arg in itr4:
98                  #############
99                  # MC Changed matching syntax to avoid gang matching
100                  #############
101                  reqtmp.append(' Member("'+arg+'" , other.GlueCESEBindGroupSEUniqueID) ')
102 <            if len(reqtmp): reqSites = reqSites + " && (" + concString.join(reqtmp) + ')'
103 <            reqSites = reqSites + ';\n'
102 >            if len(reqtmp): reqSites = reqSites + " && (" + concString.join(reqtmp)  
103 >            # requirement added to skip gliteCE
104 >            reqSites = reqSites + '&& (!RegExp("*blah*", other.GlueCEUniqueId)));\n'
105              param_file.write('Requirements = ' + req + reqSites )
106    
107              if (self.rb_param_file != ''):

Diff Legend

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