- tagging no longer supported

[tld-builder.git] / TLD_Builder / srpm_builder.py

diff --git a/TLD_Builder/srpm_builder.py b/TLD_Builder/srpm_builder.py
index 6476b043990b7bf3eeb96efd782b32fea3cb73ef..c4c48afa9edccb900e129f0fae30a106f1eda4ae 100644 (file)
--- a/TLD_Builder/srpm_builder.py
+++ b/TLD_Builder/srpm_builder.py
@@ -99,13 +99,9 @@ def build_srpm(r, b):
 
     b.src_rpm = ""
     builder_opts = "-nu -nm --nodeps --http --define \'_tld_builder 1\'"
-    if ("test-build" in r.flags):
-        tag_test=""
-    else:
-        tag_test=" -Tp %s -tt" % (config.tag_prefixes[0],)
-    cmd = ("cd rpm/packages; nice -n %s ./builder %s -bs %s -r %s %s %s %s %s 2>&1" %
+    cmd = ("cd rpm/packages; nice -n %s ./builder %s -bs %s -r %s %s %s %s 2>&1" %
              (config.nice, builder_opts, b.bconds_string(), b.branch,
-              tag_test, b.kernel_string(), b.defines_string(), b.spec))
+              b.kernel_string(), b.defines_string(), b.spec))
     util.append_to(b.logfile, "request from: %s" % r.requester)
     util.append_to(b.logfile, "started at: %s" % time.asctime())
     util.append_to(b.logfile, "building SRPM using: %s\n" % cmd)
@@ -124,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)