Author: mmazur                       Date: Sun Feb 27 12:53:30 2005 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- uploadinfo file generation is configurable (for ppl that just want to have
  a builder)
- well; that'd be all functionality I've planned for pld-builder; off to write
  some docs

---- Files affected:
pld-builder.new/PLD_Builder:
   config.py (1.30 -> 1.31) , rpm_builder.py (1.41 -> 1.42) , srpm_builder.py 
(1.40 -> 1.41) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/config.py
diff -u pld-builder.new/PLD_Builder/config.py:1.30 
pld-builder.new/PLD_Builder/config.py:1.31
--- pld-builder.new/PLD_Builder/config.py:1.30  Sun Feb 27 12:37:52 2005
+++ pld-builder.new/PLD_Builder/config.py       Sun Feb 27 13:53:25 2005
@@ -70,6 +70,7 @@
         self.notify_email = get("notify_email")
         self.admin_email = get("admin_email")
         self.builder_list = get("builder_list", "")
+        self.generate_uploadinfo = get("generate_uploadinfo", "yes")
         status.admin = self.admin_email
         status.builder_list = self.builder_list
         self.email = self.admin_email

================================================================
Index: pld-builder.new/PLD_Builder/rpm_builder.py
diff -u pld-builder.new/PLD_Builder/rpm_builder.py:1.41 
pld-builder.new/PLD_Builder/rpm_builder.py:1.42
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.41     Sun Feb 27 00:17:03 2005
+++ pld-builder.new/PLD_Builder/rpm_builder.py  Sun Feb 27 13:53:25 2005
@@ -146,7 +146,7 @@
         c=c + "END\n"
         return c
 
-    if b.files != [] and 'test-build' not in r.flags:
+    if config.gen_upinfo and b.files != [] and 'test-build' not in r.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.40 
pld-builder.new/PLD_Builder/srpm_builder.py:1.41
--- pld-builder.new/PLD_Builder/srpm_builder.py:1.40    Sat Feb 26 19:24:13 2005
+++ pld-builder.new/PLD_Builder/srpm_builder.py Sun Feb 27 13:53:25 2005
@@ -76,7 +76,7 @@
     os.chmod(local, 0644)
     ftp.add(local)
 
-    if 'test-build' not in r.flags:
+    if config.gen_upinfo and 'test-build' not in r.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))
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/config.py?r1=1.30&r2=1.31&f=u
    
http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/rpm_builder.py?r1=1.41&r2=1.42&f=u
    
http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/srpm_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

Reply via email to