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

Comparing COMP/CRAB/python/SchedulerCondor.py (file contents):
Revision 1.23 by ewv, Mon Mar 9 15:56:26 2009 UTC vs.
Revision 1.24 by ewv, Tue May 5 15:01:03 2009 UTC

# Line 54 | Line 54 | class SchedulerCondor(SchedulerLocal) :
54          self.return_data = cfg_params.get('USER.return_data', 0)
55          self.copy_data   = cfg_params.get("USER.copy_data", 0)
56  
57 <        if int(self.copy_data) == 1:
57 >        self.proxyValid = 0
58 >        self.dontCheckProxy = int(cfg_params.get("EDG.dont_check_proxy", 0))
59 >        self.proxyServer = cfg_params.get("EDG.proxy_server", 'myproxy.cern.ch')
60 >        common.logger.debug(5,'Setting myproxy server to ' + self.proxyServer)
61 >
62 >        self.group = cfg_params.get("EDG.group", None)
63 >        self.role  = cfg_params.get("EDG.role", None)
64 >        self.VO    = cfg_params.get('EDG.virtual_organization', 'cms')
65  
66 <            self.proxyValid = 0
60 <            self.dontCheckProxy = int(cfg_params.get("EDG.dont_check_proxy", 0))
61 <            self.proxyServer = cfg_params.get("EDG.proxy_server", 'myproxy.cern.ch')
62 <            common.logger.debug(5,'Setting myproxy server to ' + self.proxyServer)
63 <
64 <            self.group = cfg_params.get("EDG.group", None)
65 <            self.role  = cfg_params.get("EDG.role", None)
66 <            self.VO    = cfg_params.get('EDG.virtual_organization', 'cms')
67 <
68 <            self.checkProxy()
69 <
70 <        self.role  = None
66 >        self.checkProxy()
67  
68          return
69  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines