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.136 by spiga, Mon Sep 17 16:42:55 2007 UTC vs.
Revision 1.137 by spiga, Tue Sep 18 15:17:55 2007 UTC

# Line 204 | Line 204 | class SchedulerEdg(Scheduler):
204          try: self.schedulerName = cfg_params['CRAB.scheduler']
205          except KeyError: self.scheduler = ''
206  
207 –        self.UseServer=0
208 –        try:
209 –            self.UseServer=int(cfg_params['CRAB.server_mode'])
210 –        except KeyError:
211 –            pass
212 –
207          return
208      
209  
# Line 682 | Line 676 | class SchedulerEdg(Scheduler):
676          #xml.write('<task name="' +str(taskName)+'" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache">\n')
677  
678          #xml.write('<task name="' +str(taskName)+ '" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache"' + '" task_info="' + os.path.expandvars('X509_USER_PROXY') + '">\n')
679 <        if (self.UseServer== 9999):
680 <            xml.write('<task name="' +str(taskName)+ '" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache"' + ' task_info="' + os.environ["X509_USER_PROXY"] + '">\n')
681 <        else:
688 <            xml.write('<task name="' +str(taskName)+ '" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache"' + ' task_info="NONE">\n')
689 <
679 >        x509_cmd = 'ls /tmp/x509up_u`id -u`'
680 >        x509=runCommand(x509_cmd).strip()
681 >        xml.write('<task name="' +str(taskName)+ '" sub_path="' +common.work_space.pathForTgz() + 'share/.boss_cache"' + ' task_info="' + str(x509) + '">\n')
682          xml.write(jt_string)
683          
684          if (to_write != ''):

Diff Legend

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