altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Tweaked the submission checker shell invocation code to deal with command lines starting with environment variable settings.

Browse source 
- Legacy-Id: 14107
This commit is contained in:
Henrik Levkowetz 2017-09-08 12:09:22 +00:00
parent a9b259ef26
commit 135d5d946b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/submit/checkers.py
View file

@ -202,7 +202,7 @@ class DraftYangChecker(object):
text = file.readlines() text = file.readlines()
# pyang # pyang
cmd_template = settings.SUBMIT_PYANG_COMMAND cmd_template = settings.SUBMIT_PYANG_COMMAND
command = cmd_template.split()[0] command = [ w for w in cmd_template.split() if not '=' in w ][0]
cmd_version = VersionInfo.objects.get(command=command).version cmd_version = VersionInfo.objects.get(command=command).version
cmd = cmd_template.format(libs=modpath, model=path) cmd = cmd_template.format(libs=modpath, model=path)
code, out, err = pipe(cmd) code, out, err = pipe(cmd)
@ -231,7 +231,7 @@ class DraftYangChecker(object):
# yanglint # yanglint
if settings.SUBMIT_YANGLINT_COMMAND: if settings.SUBMIT_YANGLINT_COMMAND:
cmd_template = settings.SUBMIT_YANGLINT_COMMAND cmd_template = settings.SUBMIT_YANGLINT_COMMAND
command = cmd_template.split()[0] command = [ w for w in cmd_template.split() if not '=' in w ][0]
cmd_version = VersionInfo.objects.get(command=command).version cmd_version = VersionInfo.objects.get(command=command).version
cmd = cmd_template.format(model=path, rfclib=settings.SUBMIT_YANG_RFC_MODEL_DIR, draftlib=settings.SUBMIT_YANG_DRAFT_MODEL_DIR, tmplib=workdir) cmd = cmd_template.format(model=path, rfclib=settings.SUBMIT_YANG_RFC_MODEL_DIR, draftlib=settings.SUBMIT_YANG_DRAFT_MODEL_DIR, tmplib=workdir)
code, out, err = pipe(cmd) code, out, err = pipe(cmd)