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

Comparing COMP/CRAB/python/SubmitterServer.py (file contents):
Revision 1.57 by spiga, Tue Dec 2 15:20:40 2008 UTC vs.
Revision 1.58 by spiga, Tue Dec 2 15:34:34 2008 UTC

# Line 127 | Line 127 | class SubmitterServer( Submitter ):
127          """
128          Prepare configuration and Call credential API
129          """
130 <        common.logger.message("Registering a valid proxy to the server:")
130 >        common.logger.message("Registering credential to the server")
131          # only for temporary back-comp.
132          if  self.credentialType == 'Proxy':
133               # for proxy all works as before....
134               self.moveProxy()
135               # myProxyMoveProxy() # check within the API ( Proxy.py )
136          else:
137 <             from ProdCommon.Credential.CredentialAPI import CredentialAPI
137 >             #from ProdCommon.Credential.CredentialAPI import CredentialAPI
138 >             from CredentialAPI import CredentialAPI
139               myproxyserver = self.cfg_params.get('EDG.proxy_server', 'myproxy.cern.ch')
140               configAPI = {'credential' : self.credentialType, \
141                            'myProxySvr' : myproxyserver,\
# Line 155 | Line 156 | class SubmitterServer( Submitter ):
156                   raise CrabException("ERROR: Unable to register %s delegating server: %s\n"%(self.credentialType,self.server_name ))
157               self.cfg_params['EDG.proxyInfos'] = dict
158  
159 <        common.logger.message("Proxy successfully delegated to the server.\n")
159 >        common.logger.message("Credential successfully delegated to the server.\n")
160          return
161      # TO REMOVE
162      def moveProxy( self ):

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines