extras-buildsys/builder builder.py, 1.44.2.8.2.1.2.7, 1.44.2.8.2.1.2.8

[Michael Schwendt]

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20076/builder

Modified Files:
      Tag: Plague-0_4_5
	builder.py 
Log Message:
With Python >= 2.6 use "hashlib" not "sha" to avoid the ugly deprecation warning.



Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/Attic/builder.py,v
retrieving revision 1.44.2.8.2.1.2.7
retrieving revision 1.44.2.8.2.1.2.8
diff -u -r1.44.2.8.2.1.2.7 -r1.44.2.8.2.1.2.8
--- builder.py	13 Nov 2008 19:00:56 -0000	1.44.2.8.2.1.2.7
+++ builder.py	16 Dec 2008 19:14:39 -0000	1.44.2.8.2.1.2.8
@@ -19,9 +19,12 @@
 import socket
 import os
 import shutil
-import sha
 import time
 import sys
+if sys.version_info[0:2] < (2,6):
+    import sha
+else:
+    import hashlib
 import string
 import time
 import fcntl
@@ -555,7 +558,10 @@
             print string
 
     def _generate_uniqid(self, target_str, srpm_url):
-        sum = sha.new()
+        if sys.version_info[0:2] < (2,6):
+            sum = sha.new()
+        else:
+            sum = hashlib.sha1()
         sum.update('%d %s %s' % (time.time(), target_str, srpm_url))
         return sum.hexdigest()