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.28 by spiga, Sat Dec 12 16:35:39 2009 UTC vs.
Revision 1.30 by ewv, Wed Dec 16 17:40:08 2009 UTC

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

Diff Legend

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