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.4 by fanzago, Wed Oct 11 15:45:53 2006 UTC vs.
Revision 1.7 by slacapra, Tue Oct 17 09:52:57 2006 UTC

# Line 1 | Line 1
1 – #from Scheduler import Scheduler
1   from SchedulerEdg import SchedulerEdg
2   from crab_logger import Logger
3   from crab_exceptions import *
4   from crab_util import *
6 – #from EdgConfig import *
5   from GliteConfig import *
6   import common
7  
# Line 21 | Line 19 | class SchedulerGlite(SchedulerEdg):
19          self.glite_config = gliteConfig.config()
20  
21          if (self.glite_config != ''):
22 <            self.rb_param_file = 'WMSconfig = '+self.glite_config+';'
22 >            self.rb_param_file = 'WMSconfig = '+self.glite_config+';\n'
23              #print "rb_param_file = ", self.rb_param_file
24          return self.rb_param_file
25  
# Line 90 | Line 88 | class SchedulerGlite(SchedulerEdg):
88              param_file = open(common.work_space.shareDir()+'/'+self.param, 'w')
89  
90              itr4=self.findSites_(first[i])
91 <            req1=[]  
91 >            reqSites=''
92 >            reqtmp=[]  
93              j = 0
94              concString = '||'
95              for arg in itr4:
96                  #############
97                  # MC Changed matching syntax to avoid gang matching
98                  #############
99 <                req1.append(' Member("'+arg+'" , other.GlueCESEBindGroupSEUniqueID) ')
100 <            if len(req1): req = req + " && (" + concString.join(req1) + ')'
101 <            req = req + ';\n'
102 <            param_file.write('Requirements = ' + req )
99 >                reqtmp.append(' Member("'+arg+'" , other.GlueCESEBindGroupSEUniqueID) ')
100 >            if len(reqtmp): reqSites = reqSites + " && (" + concString.join(reqtmp) + ')'
101 >            reqSites = reqSites + ';\n'
102 >            param_file.write('Requirements = ' + req + reqSites )
103    
105 – #            if (self.edg_config and self.edg_config_vo != ''):
106 – #               param_file.write('RBconfig = "'+self.edg_config+'";\n')  
107 – #                param_file.write('RBconfigVO = "'+self.edg_config_vo+'";')
108 –
104              if (self.rb_param_file != ''):
105                  param_file.write(self.rb_param_file)  
106  
107 +            if len(self.EDG_addJdlParam):
108 +                for p in self.EDG_addJdlParam:
109 +                    param_file.write(p)
110  
111              param_file.close()  
112  

Diff Legend

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