From 082761e1839cf9680783977168dcab75c91b4884 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas@nowhere.net>
Date: May 19 2015 21:07:27 +0000
Subject: run-pylint: Bugfixes.


---

diff --git a/run-pylint b/run-pylint
index 0b58a71..6e0ed40 100755
--- a/run-pylint
+++ b/run-pylint
@@ -1,13 +1,15 @@
 #!/bin/bash
 # Handle different messages defs in pre-1.0 and 1.0 pylint.
 
+# FIXME: We should assume 1.0+ only.
+
 vers=$( pylint --version 2>/dev/null | grep ^pylint | cut -d ' ' -f2 )
 if [[ "$vers" = 1* ]]; then
     # Add messaeg W0110, only exists in 1.0+
     sed '/^disable=/s/$/,W0110/' pylint.conf > pylint-1.conf
-    pylint ${*/pylint.conf/pylint-1.conf}
+    eval pylint "${@/pylint.conf/pylint-1.conf}"
 else
-    pylint $*
+    pylint $@
 fi
 
 
diff --git a/test/run-tests b/test/run-tests
index bfd446d..e3bca1e 100755
--- a/test/run-tests
+++ b/test/run-tests
@@ -87,8 +87,9 @@ logfile="$PWD/dist/build.log"
     if [ -z "$quick" ]; then
         echo
         echo '---- pylint ----'
+        MSG_TEMPLATE="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}"
         PYTHONPATH=src ./run-pylint --rcfile=pylint.conf \
-            --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" \
+            --msg-template=\"$MSG_TEMPLATE\" \
             src plugins
         echo
         echo '---- pep8 ----'