pld-builder.new: PLD_Builder/install.py - minus allowed in conflicting name

[arekm]

Author: arekm                        Date: Mon Sep  1 20:24:03 2008 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- minus allowed in conflicting name

---- Files affected:
pld-builder.new/PLD_Builder:
   install.py (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/install.py
diff -u pld-builder.new/PLD_Builder/install.py:1.10 pld-builder.new/PLD_Builder/install.py:1.11
--- pld-builder.new/PLD_Builder/install.py:1.10	Wed Aug 13 19:51:45 2008
+++ pld-builder.new/PLD_Builder/install.py	Mon Sep  1 22:23:58 2008
@@ -105,7 +105,7 @@
     tmpdir = "/tmp/BR." + b.b_id[0:6]
     f = chroot.popen("cd rpm/SPECS; TMPDIR=%s rpmbuild -bp --nobuild --short-circuit --define 'prep exit 0' %s %s 2>&1" \
             % (tmpdir, rpmbuild_opt, b.spec))
-    rx = re.compile(r"\s+(\w+)\s+.*\s+conflicts with [^\s]+-[^-]+-[^-]+\.src$")
+    rx = re.compile(r"\s+([\w-]+)\s+.*\s+conflicts with [^\s]+-[^-]+-[^-]+\.src$")
     conflicting = {}
     for l in f.xreadlines():
         m = rx.search(l)
================================================================

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