Author: arekm Date: Thu Sep 15 19:12:29 2005 GMT Module: pld-builder.new Tag: HEAD ---- Log message: Restore old chroot.py behaviour when logstdout = False.
---- Files affected: pld-builder.new/PLD_Builder: upgrade.py (1.7 -> 1.8) , chroot.py (1.16 -> 1.17) ---- Diffs: ================================================================ Index: pld-builder.new/PLD_Builder/upgrade.py diff -u pld-builder.new/PLD_Builder/upgrade.py:1.7 pld-builder.new/PLD_Builder/upgrade.py:1.8 --- pld-builder.new/PLD_Builder/upgrade.py:1.7 Thu Sep 15 17:35:18 2005 +++ pld-builder.new/PLD_Builder/upgrade.py Thu Sep 15 21:12:24 2005 @@ -67,10 +67,13 @@ return False b.log_line("upgrading packages") res = chroot.run("rpm -Fvh %s" % string.join(b.files), user = "root", logstdout = True) + if hasattr(res, '__int__'): + if res != 0: + b.log_line("package upgrade failed") + return False + return True if res: for line in res: b.log_line(line) - else: - b.log_line("package upgrade failed") - return False - return True + return True + return False ================================================================ Index: pld-builder.new/PLD_Builder/chroot.py diff -u pld-builder.new/PLD_Builder/chroot.py:1.16 pld-builder.new/PLD_Builder/chroot.py:1.17 --- pld-builder.new/PLD_Builder/chroot.py:1.16 Thu Sep 15 20:05:37 2005 +++ pld-builder.new/PLD_Builder/chroot.py Thu Sep 15 21:12:24 2005 @@ -37,6 +37,6 @@ if logstdout: return lines else: - return True + return 0 else: - return False + return r ================================================================ ---- CVS-web: http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/upgrade.py?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/chroot.py?r1=1.16&r2=1.17&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit