pld-builder.new: PLD_Builder/install_br.py Typo.
arekm
arekm at pld-linux.org
Sun Mar 16 21:29:19 CET 2008
Author: arekm Date: Sun Mar 16 20:29:19 2008 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
Typo.
---- Files affected:
pld-builder.new/PLD_Builder:
install_br.py (1.15 -> 1.16)
---- Diffs:
================================================================
Index: pld-builder.new/PLD_Builder/install_br.py
diff -u pld-builder.new/PLD_Builder/install_br.py:1.15 pld-builder.new/PLD_Builder/install_br.py:1.16
--- pld-builder.new/PLD_Builder/install_br.py:1.15 Sun Mar 16 21:19:50 2008
+++ pld-builder.new/PLD_Builder/install_br.py Sun Mar 16 21:29:14 2008
@@ -36,7 +36,7 @@
# check conflicts in BRed packages
b.log_line("checking conflicting packages in BRed packages")
f = chroot.popen("poldek --test --caplookup -Q -v --upgrade %s" % br, user = "root")
- rx = re.compile(r".*conflicts with installed [^\s]+)-[^-]+-[^-]+$")
+ rx = re.compile(r".*conflicts with installed ([^\s]+)-[^-]+-[^-]+$")
conflicting = {}
for l in f.xreadlines():
b.log_line("rpm: %s" % l)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/install_br.py?r1=1.15&r2=1.16&f=u
More information about the pld-cvs-commit
mailing list