pld-builder.new: PLD_Builder/chroot.py - use hashlib.md5 by default and fal...

[arekm]

Author: arekm                        Date: Fri Feb  6 09:59:38 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- use hashlib.md5 by default and fallback to old md5 module

---- Files affected:
pld-builder.new/PLD_Builder:
   chroot.py (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/chroot.py
diff -u pld-builder.new/PLD_Builder/chroot.py:1.32 pld-builder.new/PLD_Builder/chroot.py:1.33
--- pld-builder.new/PLD_Builder/chroot.py:1.32	Fri Jul 18 00:22:06 2008
+++ pld-builder.new/PLD_Builder/chroot.py	Fri Feb  6 10:59:32 2009
@@ -2,9 +2,13 @@
 
 import os
 import re
-import md5
 import random
 
+try:
+    from hashlib import md5 as md5
+except ImportError:
+    from md5 import md5
+
 from config import config
 
 def quote(cmd):
@@ -42,7 +46,7 @@
         return r
 
 def cp(file, outfile, user="builder", rm=False):
-    m = md5.new()
+    m = md5()
     m.update(str(random.sample(xrange(100000), 500)))
     digest = m.hexdigest()
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/chroot.py?r1=1.32&r2=1.33&f=u