From d669326f72cf23beb12b0ef087bd002442708236 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sat, 20 Mar 2021 21:43:17 +0100 Subject: [PATCH] - tagging no longer supported --- TLD_Builder/config.py | 1 - TLD_Builder/srpm_builder.py | 7 +++---- config/builder.conf | 4 ---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/TLD_Builder/config.py b/TLD_Builder/config.py index 2e86325..3351b22 100644 --- 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 56641c5..c4c48af 100644 --- 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 39eeb0d..a999c01 100644 --- 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 -- 2.44.0