Author: mmazur Date: Sat Feb 26 23:17:09 2005 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
- proper way to do it
---- Files affected:
pld-builder.new/PLD_Builder:
report.py (1.29 -> 1.30) , rpm_builder.py (1.40 -> 1.41)
---- Diffs:
================================================================
Index: pld-builder.new/PLD_Builder/report.py
diff -u pld-builder.new/PLD_Builder/report.py:1.29
pld-builder.new/PLD_Builder/report.py:1.30
--- pld-builder.new/PLD_Builder/report.py:1.29 Sat Feb 26 23:57:26 2005
+++ pld-builder.new/PLD_Builder/report.py Sun Feb 27 00:17:03 2005
@@ -56,6 +56,7 @@
def send_report(r, is_src = False):
s_failed = ' '.join([b.spec for b in r.batches if b.build_failed])
s_ok = ' '.join([b.spec for b in r.batches if not b.build_failed])
+ upgrades_status = [b.upgraded for b in r.batches]
if s_failed: s_failed = "ERRORS: %s" % s_failed
if s_ok: s_ok = "OK: %s" % s_ok
@@ -65,7 +66,7 @@
if 'test-build' in r.flags:
subject = 'TEST BUILD '
- if 'upgrade' in r.flags and not f.upgraded:
+ if 'upgrade' in r.flags and False in upgrades_status:
subject = 'UPGRADE FAILED '
subject += ' '.join((s_failed, s_ok)).strip()
================================================================
Index: pld-builder.new/PLD_Builder/rpm_builder.py
diff -u pld-builder.new/PLD_Builder/rpm_builder.py:1.40
pld-builder.new/PLD_Builder/rpm_builder.py:1.41
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.40 Sat Feb 26 23:57:26 2005
+++ pld-builder.new/PLD_Builder/rpm_builder.py Sun Feb 27 00:17:03 2005
@@ -129,7 +129,7 @@
ll("test-build: not copying to /spools/ready/")
ll("Begin-PLD-Builder-Info")
if "upgrade" in r.flags:
- r.upgraded = upgrade.upgrade_from_batch(r, b)
+ b.upgraded = upgrade.upgrade_from_batch(r, b)
else:
ll("not upgrading")
ll("End-PLD-Builder-Info")
================================================================
---- CVS-web:
http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/report.py?r1=1.29&r2=1.30&f=u
http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/rpm_builder.py?r1=1.40&r2=1.41&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
