From e056abd8884cd0f063f25ec3a0937f156fe3d811 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Fri, 24 Jul 2020 13:39:03 +0000
Subject: [PATCH] Tweaked the handling of yanglint settings.  - Legacy-Id:
 18254

---
 ietf/settings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ietf/settings.py b/ietf/settings.py
index 7fa0ef45e..cf86d7ed6 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -806,8 +806,7 @@ IDSUBMIT_STAGING_PATH = '/a/www/www6s/staging/'
 IDSUBMIT_STAGING_URL = '//www.ietf.org/staging/'
 IDSUBMIT_IDNITS_BINARY = '/a/www/ietf-datatracker/scripts/idnits'
 SUBMIT_PYANG_COMMAND = 'pyang --verbose --ietf -p {libs} {model}'
-SUBMIT_YANGLINT_BINARY = '/usr/bin/yanglint'
-SUBMIT_YANGLINT_COMMAND = '%s --verbose -p {tmplib} -p {rfclib} -p {draftlib} -p {ianalib} -p {cataloglib} {model} -i' % SUBMIT_YANGLINT_BINARY
+SUBMIT_YANGLINT_COMMAND = 'yanglint --verbose -p {tmplib} -p {rfclib} -p {draftlib} -p {ianalib} -p {cataloglib} {model} -i'
 
 SUBMIT_YANG_CATALOG_MODULEARG = "modules[]={module}"
 SUBMIT_YANG_CATALOG_IMPACT_URL = "https://www.yangcatalog.org/yang-search/impact_analysis.php?{moduleargs}&recurse=0&rfcs=1&show_subm=1&show_dir=both"
@@ -948,6 +947,7 @@ OIDC_EXTRA_SCOPE_CLAIMS = 'ietf.ietfauth.utils.OidcExtraScopeClaims'
 DOT_BINARY = '/usr/bin/dot'
 UNFLATTEN_BINARY= '/usr/bin/unflatten'
 RSYNC_BINARY = '/usr/bin/rsync'
+YANGLINT_BINARY = '/usr/bin/yanglint'
 
 # Account settings
 DAYS_TO_EXPIRE_REGISTRATION_LINK = 3