- tagging no longer supported

diff --git a/TLD_Builder/config.py b/TLD_Builder/config.py
index 2e86325f014ef6454a5a848694443fd20b9e52bb..3351b22e770b86c9052f804d1bd208c621aaf8bf 100644 (file)
--- a/TLD_Builder/config.py
+++ b/TLD_Builder/config.py
@@ -69,7 +69,6 @@ class Builder_Conf:
 
         self.binary_builders = string.split(get("binary_builders"))
         self.src_builder = string.strip(get("src_builder", ""))
-        self.tag_prefixes = string.split(get("tag_prefixes", ""))
         self.max_keep_time = int(get("max_keep_time", 168))*60*60
         self.bot_email = get("bot_email", "")
         self.control_url = get("control_url")

diff --git a/TLD_Builder/srpm_builder.py b/TLD_Builder/srpm_builder.py
index 56641c516c448b8fbc010e7961e45dc398f6a454..c4c48afa9edccb900e129f0fae30a106f1eda4ae 100644 (file)
--- a/TLD_Builder/srpm_builder.py
+++ b/TLD_Builder/srpm_builder.py
@@ -120,10 +120,9 @@ def build_srpm(r, b):
         util.append_to(b.logfile, "error: No files produced.")
         res = "FAIL"
     if res == 0 and not "test-build" in r.flags:
-        for pref in config.tag_prefixes:
-            util.append_to(b.logfile, "Tagging with prefix: %s" % pref)
-           res = chroot.run("cd rpm/packages; ./builder -bs %s -r %s -Tp %s -Tv --pkgrev %s %s" % \
-                        (b.bconds_string(), b.branch, pref, b.defines_string(), b.spec), logfile = b.logfile)
+        util.append_to(b.logfile, "Writing pkgrev")
+            res = chroot.run("cd rpm/packages; ./builder -bs %s -r %s --pkgrev %s %s" % \
+                (b.bconds_string(), b.branch, b.defines_string(), b.spec), logfile = b.logfile)
     if res == 0:
         transfer_file(r, b)
 

diff --git a/config/builder.conf b/config/builder.conf
index 39eeb0d17f166eae93c38b506b4c7bbcf25db6b1..a999c01ea3cb4aaee8446bc8a7b455d3984ceb52 100644 (file)
--- a/config/builder.conf
+++ b/config/builder.conf
@@ -56,10 +56,6 @@ control_url = http://src.tld-linux.org/~builderti/
 # 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/ti/
-
 # ------ request handler server config, ignored on binary builders:
 [request-server]
 port = 1231