Author: mmazur Date: Sat Feb 26 22:57:31 2005 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
- UPGRADE FAILED and TEST BUILD in subjects
---- Files affected:
pld-builder.new/PLD_Builder:
report.py (1.28 -> 1.29) , rpm_builder.py (1.39 -> 1.40) , upgrade.py (1.5
-> 1.6)
---- Diffs:
================================================================
Index: pld-builder.new/PLD_Builder/report.py
diff -u pld-builder.new/PLD_Builder/report.py:1.28
pld-builder.new/PLD_Builder/report.py:1.29
--- pld-builder.new/PLD_Builder/report.py:1.28 Sat Feb 26 20:15:49 2005
+++ pld-builder.new/PLD_Builder/report.py Sat Feb 26 23:57:26 2005
@@ -62,8 +62,11 @@
subject = ''
- if is_src and 'test-build' in r.flags:
+ if 'test-build' in r.flags:
subject = 'TEST BUILD '
+
+ if 'upgrade' in r.flags and not f.upgraded:
+ 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.39
pld-builder.new/PLD_Builder/rpm_builder.py:1.40
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.39 Sat Feb 26 19:24:13 2005
+++ pld-builder.new/PLD_Builder/rpm_builder.py Sat Feb 26 23:57:26 2005
@@ -129,7 +129,7 @@
ll("test-build: not copying to /spools/ready/")
ll("Begin-PLD-Builder-Info")
if "upgrade" in r.flags:
- upgrade.upgrade_from_batch(r, b)
+ r.upgraded = upgrade.upgrade_from_batch(r, b)
else:
ll("not upgrading")
ll("End-PLD-Builder-Info")
================================================================
Index: pld-builder.new/PLD_Builder/upgrade.py
diff -u pld-builder.new/PLD_Builder/upgrade.py:1.5
pld-builder.new/PLD_Builder/upgrade.py:1.6
--- pld-builder.new/PLD_Builder/upgrade.py:1.5 Thu Dec 9 19:09:06 2004
+++ pld-builder.new/PLD_Builder/upgrade.py Sat Feb 26 23:57:26 2005
@@ -54,19 +54,20 @@
if err != "":
util.append_to(b.logfile, err)
log.notice("cannot upgrade rpms")
- return
+ return False
k = string.join(killset.keys())
if 0:
b.log_line("removing %s" % k)
res = chroot.run("rpm -e %s" % k, logfile = b.logfile, user =
"root")
if res != 0:
b.log_line("package removal failed")
- return
+ return False
else:
b.log_line("upgrade would need removal of %s" % k)
- return
+ return False
b.log_line("upgrading packages")
res = chroot.run("rpm -Fvh %s" % string.join(b.files), user = "root")
if res != 0:
b.log_line("package upgrade failed")
- return
+ return False
+ return True
================================================================
---- CVS-web:
http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/report.py?r1=1.28&r2=1.29&f=u
http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/rpm_builder.py?r1=1.39&r2=1.40&f=u
http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/upgrade.py?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
