pld-builder.new: PLD_Builder/install.py - get by name not number

[arekm]

Author: arekm                        Date: Wed Apr  8 12:05:52 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- get by name not number

---- Files affected:
pld-builder.new/PLD_Builder:
   install.py (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/install.py
diff -u pld-builder.new/PLD_Builder/install.py:1.15 pld-builder.new/PLD_Builder/install.py:1.16
--- pld-builder.new/PLD_Builder/install.py:1.15	Thu Mar 12 08:33:14 2009
+++ pld-builder.new/PLD_Builder/install.py	Wed Apr  8 14:05:47 2009
@@ -152,12 +152,12 @@
     b.log_line("checking conflicting packages in BRed packages")
     f = chroot.popen("poldek --test --noask --caplookup -Q -v --upgrade %s" % br, user = "root")
     # phonon-devel-4.3.1-1.i686 conflicts with qt4-phonon-devel-4.5.0-6.i686
-    rx = re.compile(r".*conflicts with( installed|) ([^\s]+)-[^-]+-[^-]+($| .*)")
+    rx = re.compile(r".*conflicts with( installed|) (?P<name>[^\s]+)-[^-]+-[^-]+($| .*)")
     conflicting = {}
     for l in f.xreadlines():
         b.log_line("poldek: %s" % l.rstrip())
         m = rx.search(l)
-        if m: conflicting[m.group(1)] = 1
+        if m: conflicting[m.group('name')] = 1
     f.close()
     if len(conflicting) == 0:
         b.log_line("no conflicts found")
================================================================

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