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

Comparing COMP/CRAB/python/SchedulerEdg.py (file contents):
Revision 1.154 by ewv, Wed Nov 14 16:35:20 2007 UTC vs.
Revision 1.155 by spiga, Fri Dec 7 13:17:27 2007 UTC

# Line 170 | Line 170 | class SchedulerEdg(Scheduler):
170          try: self.EDG_requirements = cfg_params['EDG.requirements']
171          except KeyError: self.EDG_requirements = ''
172  
173 <        try: self.EDG_addJdlParam = string.split(cfg_params['EDG.additional_jdl_parameters'],',')
173 >        try: self.EDG_addJdlParam = string.split(cfg_params['EDG.additional_jdl_parameters'],';')
174          except KeyError: self.EDG_addJdlParam = []
175  
176          try: self.EDG_retry_count = cfg_params['EDG.retry_count']
# Line 299 | Line 299 | class SchedulerEdg(Scheduler):
299                  param_file.write(self.rb_param_file)
300  
301              if len(self.EDG_addJdlParam):
302 +                if self.EDG_addJdlParam[-1] == '': self.EDG_addJdlParam= self.EDG_addJdlParam[:-1]
303                  for p in self.EDG_addJdlParam:
304 <                    param_file.write(p)
304 >                    param_file.write(string.strip(p)+';\n')
305  
306              param_file.close()
307  

Diff Legend

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