From 3604921af97f387ac6a4de7e1255a09f8141b09a Mon Sep 17 00:00:00 2001 From: Wouter van Heijst Date: Fri, 29 Sep 2017 10:17:50 +0300 Subject: [PATCH] Include special tokens, like DEVICEMODEL, in shell quoting check Prior to this, any tokens set in tokenmap after the loop over Token.objects would be passed unquoted to mic. If they contain spaces this would break the mic invocation. --- src/img_web/app/views.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/img_web/app/views.py b/src/img_web/app/views.py index 6fc31da..bd98367 100644 --- a/src/img_web/app/views.py +++ b/src/img_web/app/views.py @@ -140,9 +140,6 @@ def submit(request): else: tokenmap["RELEASEPATTERN"] = ":/%s" % tokenvalue - if " " in tokenvalue: - tokenvalue = '"%s"' % tokenvalue - tokenmap[token.name] = tokenvalue archtoken = jobdata['architecture'] @@ -159,7 +156,9 @@ def submit(request): tokens_list = [] extra_repos_tmp = [] - for token, tokenvalue in tokenmap.items(): + for token, tokenvalue in tokenmap.items(): + if " " in tokenvalue: + tokenvalue = '"%s"' % tokenvalue ksname = ksname.replace("@%s@" % token, tokenvalue) tokens_list.append("%s:%s" % (token, tokenvalue)) for repo in extra_repos: