From 05c2758b4f85abdfec5cd81a73ab77c5bc90463a Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Tue, 24 Aug 2021 13:01:11 +0200 Subject: [PATCH] Handle situations where no extra BR's are required Generating extra BR's is optional. --- conf2spec.py | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/conf2spec.py b/conf2spec.py index 3084f21..b34d599 100644 --- a/conf2spec.py +++ b/conf2spec.py @@ -27,19 +27,25 @@ def generate_extra_build_requires(config): # TODO: This doesn't handle doubles like -xr options = { - "test": "-t", - "runtime": "-r", - "extra": "-x", + "test": " -t", + "runtime": " -r", + "extra": " -x", } - extra_brs = "" - for extra_br in config["extra_build_requires"]: - if extra_br == "extra": - extra_brs += options.get(extra_br, "") + " " - extra_brs += ",".join(config["extra_test_env"]) - else: - extra_brs += options.get(extra_br, "") + " " + extra_brs = config.get("extra_build_requires", None) - return extra_brs.rstrip() + # No extra BuildRequires were defined - return empty string + if not extra_brs: + return "" + + generated_brs = "" + for extra_br in extra_brs: + if extra_br == "extra": + generated_brs += options.get(extra_br, "") + " " + generated_brs += ",".join(config["extra_test_env"]) + else: + generated_brs += options.get(extra_br, "") + + return generated_brs.rstrip() def generate_check(config):