Author: arekm Date: Wed Apr 8 17:15:23 2009 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
make poldek run rpm with --test when testing deps
---- Files affected:
pld-builder.new/PLD_Builder:
install.py (1.19 -> 1.20)
---- Diffs:
================================================================
Index: pld-builder.new/PLD_Builder/install.py
diff -u pld-builder.new/PLD_Builder/install.py:1.19
pld-builder.new/PLD_Builder/install.py:1.20
--- pld-builder.new/PLD_Builder/install.py:1.19 Wed Apr 8 15:50:07 2009
+++ pld-builder.new/PLD_Builder/install.py Wed Apr 8 19:15:18 2009
@@ -27,7 +27,7 @@
del killset[p]
errors += "cannot remove %s because it's crucial\n" % p
else:
- f = chroot.popen("poldek --noask --test --erase %s" % p, user =
"root")
+ f = chroot.popen("poldek --noask --test --test --erase %s" % p,
user = "root")
crucial = 0
e = []
for l in f.xreadlines():
@@ -156,7 +156,7 @@
chroot.run("poldek --up --upa", user = "root", logfile = b.logfile)
# check conflicts in BRed packages
b.log_line("checking conflicting packages in BRed packages")
- f = chroot.popen("poldek --test --noask --caplookup -Q -v --upgrade %s" %
br, user = "root")
+ 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]+)-[^-]+-[^-]+($| .*)")
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/install.py?r1=1.19&r2=1.20&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
