pld-builder.new: PLD_Builder/upgrade.py upgrade_from_batch(): Buil...

[arekm]

Author: arekm                        Date: Tue Nov  1 20:52:41 2005 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
upgrade_from_batch(): Build list of packages which would be removed only from these already installed (so avoid other missing deps for example).

---- Files affected:
pld-builder.new/PLD_Builder:
   upgrade.py (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/upgrade.py
diff -u pld-builder.new/PLD_Builder/upgrade.py:1.9 pld-builder.new/PLD_Builder/upgrade.py:1.10
--- pld-builder.new/PLD_Builder/upgrade.py:1.9	Thu Sep 22 20:33:25 2005
+++ pld-builder.new/PLD_Builder/upgrade.py	Tue Nov  1 21:52:36 2005
@@ -45,7 +45,7 @@
 def upgrade_from_batch(r, b):
     f = chroot.popen("rpm --test -F %s 2>&1" % string.join(b.files), user = "root")
     killset = {}
-    rx = re.compile(r' ([^\s]+)-[^-]+-[^-]+$')
+    rx = re.compile(r' \(installed\) ([^\s]+)-[^-]+-[^-]+$')
     for l in f.xreadlines():
         m = rx.search(l)
         if m: killset[m.group(1)] = 1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/upgrade.py?r1=1.9&r2=1.10&f=u