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.27 by ewv, Tue Aug 18 15:00:37 2009 UTC vs.
Revision 1.29 by ewv, Wed Dec 16 17:37:28 2009 UTC

# Line 11 | Line 11 | from crab_exceptions import CrabExceptio
11   import common
12   import os
13   import socket
14 < import sha
14 > try:
15 >    from hashlib import sha1
16 > except:
17 >    from sha import sha as sha1
18  
19   class SchedulerCondor(SchedulerLocal) :
20      """
# Line 68 | Line 71 | class SchedulerCondor(SchedulerLocal) :
71          return
72  
73      def envUniqueID(self):
74 <        taskHash = sha.new(common._db.queryTask('name')).hexdigest()
74 >        taskHash = sha1(common._db.queryTask('name')).hexdigest()
75          id = "https://" + socket.gethostname() + '/' + taskHash + "/${NJob}"
76          return id
77  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines