summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Wright <fw@fwright.net>2017-09-09 22:24:21 -0700
committerFred Wright <fw@fwright.net>2017-09-09 22:30:08 -0700
commit3db781b747e03df8faa71a8d4281f9294e05084b (patch)
tree834ee919902264619f3c8521691ee2f5b82e3814
parent03bd97a3fc1cd5270f75113c671b4db3db57a6ff (diff)
downloadgpsd-3db781b747e03df8faa71a8d4281f9294e05084b.tar.gz
Fixes broken xgps=no build.
Commit 519bd230 added removal of xgps programs from pylint checker list, even when they weren't included, causing a build crash when xgps=no. TESTED: Pylint results are unchanged with xgps=yes. Build no longer crashes with xgps=no.
-rw-r--r--SConstruct5
1 files changed, 3 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index 7ffe326e..4923ad8c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1762,8 +1762,9 @@ if len(python_progs) > 0:
# Theres's an internal error in astroid that requires we disable some
# auditing. This is irritating as hell but there's no help for it short
# of an upstream fix.
- checkable.remove("xgps")
- checkable.remove("xgpsspeed")
+ if env['xgps']:
+ checkable.remove("xgps")
+ checkable.remove("xgpsspeed")
pylint = Utility(
"pylint", ["jsongen.py", "maskaudit.py", python_built_extensions],
['''pylint --rcfile=/dev/null --dummy-variables-rgx='^_' '''