summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorFred Wright <fw@fwright.net>2017-03-03 15:37:04 -0800
committerFred Wright <fw@fwright.net>2017-03-03 15:42:04 -0800
commite5a0edf9aa58475aaa59e9a238374904d713182c (patch)
treedb34daed8a87987362491f04fce9971c52307ae4 /SConstruct
parent26e2f525f3a1a2904eb4e5e83a1667fef2cada78 (diff)
downloadgpsd-e5a0edf9aa58475aaa59e9a238374904d713182c.tar.gz
Fixes error detection on build of www/hardware.html.
The invocation of gpscap.py was ignoring the exit status, thereby allowing the build to succeed even when the program didn't. The fix is simply to chain the shell commands with '&&' rather than ';'. TESTED: Verified that the known bug now causes a build failure. Also verified that "scons build-all check" still works.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct2
1 files changed, 1 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index e593fa72..40b5df41 100644
--- a/SConstruct
+++ b/SConstruct
@@ -2074,7 +2074,7 @@ env.Command('www/hardware.html', ['gpscap.py',
'www/hardware-head.html',
'gpscap.ini',
'www/hardware-tail.html'],
- ['(cat www/hardware-head.html; $SC_PYTHON gpscap.py; cat www/hardware-tail.html) >www/hardware.html'])
+ ['(cat www/hardware-head.html && $SC_PYTHON gpscap.py && cat www/hardware-tail.html) >www/hardware.html'])
# The diagram editor dia is required in order to edit the diagram masters
# Utility("www/cycle.svg", ["www/cycle.dia"], ["dia -e www/cycle.svg www/cycle.dia"])