pld-builder.new: PLD_Builder/install_br.py rstrip lines. New line ...
arekm
arekm at pld-linux.org
Tue Mar 18 21:55:54 CET 2008
Author: arekm Date: Tue Mar 18 20:55:54 2008 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
rstrip lines. New line is added later in log_line.
---- Files affected:
pld-builder.new/PLD_Builder:
install_br.py (1.17 -> 1.18)
---- Diffs:
================================================================
Index: pld-builder.new/PLD_Builder/install_br.py
diff -u pld-builder.new/PLD_Builder/install_br.py:1.17 pld-builder.new/PLD_Builder/install_br.py:1.18
--- pld-builder.new/PLD_Builder/install_br.py:1.17 Sun Mar 16 21:31:16 2008
+++ pld-builder.new/PLD_Builder/install_br.py Tue Mar 18 21:55:49 2008
@@ -17,7 +17,7 @@
needed = {}
b.log_line("checking BR")
for l in f.xreadlines():
- b.log_line("rpm: %s" % l)
+ b.log_line("rpm: %s" % l.rstrip())
m = rx.search(l)
if m: needed[m.group(1)] = 1
f.close()
@@ -39,7 +39,7 @@
rx = re.compile(r".*conflicts with installed ([^\s]+)-[^-]+-[^-]+$")
conflicting = {}
for l in f.xreadlines():
- b.log_line("poldek: %s" % l)
+ b.log_line("poldek: %s" % l.rstrip())
m = rx.search(l)
if m: conflicting[m.group(1)] = 1
f.close()
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/install_br.py?r1=1.17&r2=1.18&f=u
More information about the pld-cvs-commit
mailing list