From bf58b8f80368b679f0cb05e98901789028405869 Mon Sep 17 00:00:00 2001 From: nkraetzschmar <9020053+nkraetzschmar@users.noreply.github.com> Date: Tue, 26 Sep 2023 15:40:59 +0200 Subject: [PATCH] fix: mv setting of arch=None, version=None before getting it from cname regex to prevent resetting to default --- builder/parse_features | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/builder/parse_features b/builder/parse_features index 9eb019a..7d32e1d 100755 --- a/builder/parse_features +++ b/builder/parse_features @@ -36,6 +36,10 @@ def main(): args = parser.parse_args() assert bool(args.features) ^ bool(args.cname), "please provide either `--features` or `--cname` argument" + + arch = None + version = None + if args.cname: search = re.search("^([a-z][a-zA-Z0-9_-]*?)(-(amd64|arm64)(-([a-z0-9.]+))?)?$", args.cname) assert search, f"not a valid cname {args.cname}" @@ -47,11 +51,9 @@ def main(): else: input_features = args.features - arch = None if args.arch: arch = args.arch - version = None if args.version: version = args.version