pld-builder.new: PLD_Builder/config.py, PLD_Builder/rpm_builder.py, config/...

[glen]

Author: glen                         Date: Thu Jul 17 16:03:32 2008 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- make rpm_cache_dir=/spools/ready configurable

---- Files affected:
pld-builder.new/PLD_Builder:
   config.py (1.35 -> 1.36) , rpm_builder.py (1.60 -> 1.61) 
pld-builder.new/config:
   builder.conf (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/config.py
diff -u pld-builder.new/PLD_Builder/config.py:1.35 pld-builder.new/PLD_Builder/config.py:1.36
--- pld-builder.new/PLD_Builder/config.py:1.35	Tue Nov 20 21:03:06 2007
+++ pld-builder.new/PLD_Builder/config.py	Thu Jul 17 18:03:27 2008
@@ -95,6 +95,7 @@
         self.job_slots = int(get("job_slots"))
         self.max_load = float(get("max_load"))
         self.control_url = get("control_url")
+        self.rpm_cache_dir = get("rpm_cache_dir", "/spools/ready")
         self.builder_user = get("builder_user", "builder")
         self.sudo_chroot_wrapper = get("sudo_chroot_wrapper", "")
         self.nice = get("nice", "0")

================================================================
Index: pld-builder.new/PLD_Builder/rpm_builder.py
diff -u pld-builder.new/PLD_Builder/rpm_builder.py:1.60 pld-builder.new/PLD_Builder/rpm_builder.py:1.61
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.60	Fri Jun 27 19:33:35 2008
+++ pld-builder.new/PLD_Builder/rpm_builder.py	Thu Jul 17 18:03:27 2008
@@ -143,12 +143,17 @@
         util.append_to(b.logfile, l)
  
     if b.files != []:
+        rpm_cache_dir = config.rpm_cache_dir
         if "test-build" not in r.flags:
-            chroot.run("cp -f %s /spools/ready/; poldek --mo=nodiff --mkidxz " \
-                     "-s /spools/ready/" % \
-                     string.join(b.files), logfile = b.logfile, user = "root")
+            # XXX missing error check!
+            b.log_line("copy rpm files to cache_dir=%s" % rpm_cache_dir)
+            res = chroot.run(
+                    "cp -f %s %s && poldek --mo=nodiff --mkidxz -s %s/" % \
+                        (string.join(b.files), rpm_cache_dir, rpm_cache_dir),
+                     logfile = b.logfile, user = "root"
+            )
         else:
-            ll("test-build: not copying to /spools/ready/")
+            ll("test-build: not copying to " + rpm_cache_dir)
         ll("Begin-PLD-Builder-Info")
         if "upgrade" in r.flags:
             b.upgraded = upgrade.upgrade_from_batch(r, b)

================================================================
Index: pld-builder.new/config/builder.conf
diff -u pld-builder.new/config/builder.conf:1.35 pld-builder.new/config/builder.conf:1.36
--- pld-builder.new/config/builder.conf:1.35	Tue Jul 15 08:47:30 2008
+++ pld-builder.new/config/builder.conf	Thu Jul 17 18:03:27 2008
@@ -50,6 +50,9 @@
 # Src builder's email for sending status notifications (build ok/failed).
 #notify_email = builder-ac-src at pld-linux.org
 
+# Where to cache rpm's from binary builders locally
+rpm_cache_dir = /spools/ready
+
 # ------ SRC builder config:
 # List of name-version-release tag prefixes.
 #tag_prefixes = auto- auto-ac- auto-th-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/config.py?r1=1.35&r2=1.36&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/rpm_builder.py?r1=1.60&r2=1.61&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/config/builder.conf?r1=1.35&r2=1.36&f=u