pld-builder.new: PLD_Builder/util.py Correctly overwrite uuid value.

[arekm]

Author: arekm                        Date: Sun Jun 22 12:26:37 2008 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
Correctly overwrite uuid value.

---- Files affected:
pld-builder.new/PLD_Builder:
   util.py (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/util.py
diff -u pld-builder.new/PLD_Builder/util.py:1.7 pld-builder.new/PLD_Builder/util.py:1.8
--- pld-builder.new/PLD_Builder/util.py:1.7	Sun Jun 22 14:20:43 2008
+++ pld-builder.new/PLD_Builder/util.py	Sun Jun 22 14:26:32 2008
@@ -6,9 +6,6 @@
 import log
 import string
 
-def uuid_python():
-    return uuid.uuid4()
-
 def uuid_external():
     f = os.popen("uuidgen 2>&1")
     u = string.strip(f.read())
@@ -19,11 +16,9 @@
 
 # uuid module available in python >= 2.5
 try:
-    import uuid
+    from uuid import uuid4 as uuid
 except ImportError:
     uuid = uuid_external
-else:
-    uuid = uuid_python
 
 def pkg_name(nvr):
     return re.match(r"(.+)-[^-]+-[^-]+", nvr).group(1)
================================================================

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