- allow tagging

Changed files:
    PLD_Builder/config.py -> 1.18
    PLD_Builder/srpm_builder.py -> 1.22
    config/builder.conf -> 1.18

diff --git a/PLD_Builder/config.py b/PLD_Builder/config.py
index d5431a2ed3bb9feedb68c89d28dce5594ffeefdd..065c1e8b42f154d1615c09637777f1570f38f0de 100644 (file)
--- a/PLD_Builder/config.py
+++ b/PLD_Builder/config.py
@@ -60,6 +60,7 @@ class Builder_Conf:
     self.builder = builder
 
     self.binary_builders = string.split(get("binary_builders"))
+    self.tag_prefixes = string.split(get("tag_prefixes", ""))
     self.control_url = get("control_url")
     self.notify_email = get("notify_email")
     self.admin_email = get("admin_email")

diff --git a/PLD_Builder/srpm_builder.py b/PLD_Builder/srpm_builder.py
index 00ffd49d17818a5a4f1e7be49b82d33129d4aad6..2e4373b49e69530ee624e6b8153aefba4ce29a92 100644 (file)
--- a/PLD_Builder/srpm_builder.py
+++ b/PLD_Builder/srpm_builder.py
@@ -99,6 +99,10 @@ def build_srpm(r, b):
     res = 1
   if res == 0:
     transfer_file(r, b)
+  if res == 0:
+    for pref in config.tag_prefixes:
+      chroot.run("cd rpm/SPECS; ./builder -Tp %s -Tv %s" % \
+                  (pref, b.spec), logfile = b.logfile)
   chroot.run("cd rpm/SPECS; rpmbuild --nodeps --nobuild " \
              "--clean --rmspec --rmsource %s" % \
              b.spec, logfile = b.logfile)

diff --git a/config/builder.conf b/config/builder.conf
index f7f226201dd52fdc05cc5730c07b5e0c83543ae0..714f703a2420b5c8eb35dbbf795c10cb4daa8e89 100644 (file)
--- a/config/builder.conf
+++ b/config/builder.conf
@@ -24,6 +24,11 @@ control_url = http://roke.freak/builder/
 # email where to send status notifications
 notify_email = srpms_builder@roke.freak
 
+# ------ SRC builder config:
+# list of name-version-release tag prefixes
+#tag_prefixes = auto- auto-ac-
+tag_prefixes =
+
 [roke-src]
 arch = athlon
 chroot = /adm/chroot-src