pld-builder.new: PLD_Builder/install.py Log conflicing packages only.

[arekm]

Author: arekm                        Date: Sun Aug 10 21:53:29 2008 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
Log conflicing packages only.

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

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/install.py
diff -u pld-builder.new/PLD_Builder/install.py:1.7 pld-builder.new/PLD_Builder/install.py:1.8
--- pld-builder.new/PLD_Builder/install.py:1.7	Sun Aug 10 23:45:54 2008
+++ pld-builder.new/PLD_Builder/install.py	Sun Aug 10 23:53:24 2008
@@ -108,9 +108,10 @@
     rx = re.compile(r"\s+(\w+)\s+.*\s+conflicts with [^\s]+-[^-]+-[^-]+\.src$")
     conflicting = {}
     for l in f.xreadlines():
-        b.log_line("rpmbuild: %s" % l.rstrip())
         m = rx.search(l)
-        if m: conflicting[m.group(1)] = 1
+        if m:
+            b.log_line("rpmbuild: %s" % l.rstrip())
+            conflicting[m.group(1)] = 1
     f.close()
     if len(conflicting) and not uninstall(conflicting, b):
         return False
================================================================

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