ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/CRAB/python/SchedulerCondor.py

Comparing COMP/CRAB/python/SchedulerCondor.py (file contents):
Revision 1.25 by spiga, Tue May 26 10:23:01 2009 UTC vs.
Revision 1.26 by spiga, Tue May 26 16:53:23 2009 UTC

#	Line 55 | Line 55 | class SchedulerCondor(SchedulerLocal) :
55		self.copy_data   = cfg_params.get("USER.copy_data", 0)
56
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')
58	>	self.dontCheckProxy = int(cfg_params.get("GRID.dont_check_proxy", 0))
59	>	self.proxyServer = cfg_params.get("GRID.proxy_server", 'myproxy.cern.ch')
60		common.logger.debug('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')
62	>	self.group = cfg_params.get("GRID.group", None)
63	>	self.role  = cfg_params.get("GRID.role", None)
64	>	self.VO    = cfg_params.get('GRID.virtual_organization', 'cms')
65
66		self.checkProxy()
67

Diff Legend

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