Author: mmazur Date: Sat Feb 26 18:18:35 2005 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
- don't upload .uploadinfo files on test-builds
---- Files affected:
pld-builder.new/PLD_Builder:
rpm_builder.py (1.37 -> 1.38) , srpm_builder.py (1.38 -> 1.39)
---- Diffs:
================================================================
Index: pld-builder.new/PLD_Builder/rpm_builder.py
diff -u pld-builder.new/PLD_Builder/rpm_builder.py:1.37
pld-builder.new/PLD_Builder/rpm_builder.py:1.38
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.37 Sat Feb 26 15:00:16 2005
+++ pld-builder.new/PLD_Builder/rpm_builder.py Sat Feb 26 19:18:29 2005
@@ -146,7 +146,7 @@
c=c + "END\n"
return c
- if b.files != []:
+ if b.files != [] and 'test-build' not in b.command_flags:
fname = r.tmp_dir + b.src_rpm + ".uploadinfo"
f = open(fname, "w")
f.write(uploadinfo(b))
================================================================
Index: pld-builder.new/PLD_Builder/srpm_builder.py
diff -u pld-builder.new/PLD_Builder/srpm_builder.py:1.38
pld-builder.new/PLD_Builder/srpm_builder.py:1.39
--- pld-builder.new/PLD_Builder/srpm_builder.py:1.38 Sat Feb 26 15:00:16 2005
+++ pld-builder.new/PLD_Builder/srpm_builder.py Sat Feb 26 19:18:29 2005
@@ -76,11 +76,12 @@
os.chmod(local, 0644)
ftp.add(local)
- fname = path.srpms_dir + r.id + "/" + b.src_rpm + ".uploadinfo"
- f = open(fname, "w")
-
f.write("info:build:%s:requester:%s\ninfo:build:%s:requester_email:%s\nfile:SRPMS:%s\nEND\n"
% (b.gb_id, b.requester, b.gb_id, b.requester_email, b.src_rpm))
- f.close()
- ftp.add(fname, "uploadinfo")
+ if 'test-build' not in b.command_flags:
+ fname = path.srpms_dir + r.id + "/" + b.src_rpm + ".uploadinfo"
+ f = open(fname, "w")
+
f.write("info:build:%s:requester:%s\ninfo:build:%s:requester_email:%s\nfile:SRPMS:%s\nEND\n"
% (b.gb_id, b.requester, b.gb_id, b.requester_email, b.src_rpm))
+ f.close()
+ ftp.add(fname, "uploadinfo")
def build_srpm(r, b):
status.push("building %s" % b.spec)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/rpm_builder.py?r1=1.37&r2=1.38&f=u
http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/srpm_builder.py?r1=1.38&r2=1.39&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
