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.45 by spiga, Tue Mar 28 07:38:37 2006 UTC vs.
Revision 1.46 by slacapra, Tue Mar 28 16:50:16 2006 UTC

# Line 2 | Line 2 | from Scheduler import Scheduler
2   from crab_logger import Logger
3   from crab_exceptions import *
4   from crab_util import *
5 + from EdgConfig import *
6   import common
7  
8   import os, sys, time
# Line 21 | Line 22 | class SchedulerEdg(Scheduler):
22  
23      def configure(self, cfg_params):
24  
25 <        try: self.edg_config = cfg_params["EDG.config"]
26 <        except KeyError: self.edg_config = ''
27 <
28 <        try: self.edg_config_vo = cfg_params["EDG.config_vo"]
29 <        except KeyError: self.edg_config_vo = ''
25 >        try:
26 >            RB = cfg_params["EDG.rb"]
27 >            edgConfig = EdgConfig(RB)
28 >            self.edg_config = edgConfig.config()
29 >            self.edg_config_vo = edgConfig.configVO()
30 >        except KeyError:
31 >            self.edg_config = ''
32 >            self.edg_config_vo = ''
33  
34          try: self.LCG_version = cfg_params["EDG.lcg_version"]
35          except KeyError: self.LCG_version = '2'

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines