pld-builder.new: PLD_Builder/install.py - handle deps returned by rpm

[arekm]

Author: arekm                        Date: Wed Apr  8 17:30:07 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- handle deps returned by rpm

---- Files affected:
pld-builder.new/PLD_Builder:
   install.py (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/install.py
diff -u pld-builder.new/PLD_Builder/install.py:1.20 pld-builder.new/PLD_Builder/install.py:1.21
--- pld-builder.new/PLD_Builder/install.py:1.20	Wed Apr  8 19:15:18 2009
+++ pld-builder.new/PLD_Builder/install.py	Wed Apr  8 19:30:02 2009
@@ -159,7 +159,7 @@
     f = chroot.popen("poldek --test --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
     # jdbc-stdext >= 2.0 is required by installed java-struts-1.3.10-1.noarch
-    rx = re.compile(r".*(conflicts with|is required by)( installed|) (?P<name>[^\s]+)-[^-]+-[^-]+($| .*)")
+    rx = re.compile(r".*(conflicts with|is required by|is needed by)( installed| \(installed\)|) (?P<name>[^\s]+)-[^-]+-[^-]+($| .*)")
     conflicting = {}
     for l in f.xreadlines():
         b.log_line("poldek: %s" % l.rstrip())
================================================================

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