[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gpsd-commit-watch] [SCM] GPSD branch, master, updated. release-3.16-587
From: |
Fred Wright |
Subject: |
[gpsd-commit-watch] [SCM] GPSD branch, master, updated. release-3.16-587-gb396450 |
Date: |
Fri, 3 Mar 2017 18:54:00 -0500 (EST) |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GPSD".
The branch, master has been updated
via b396450d1c29148edcd9e468ca1775464151ed5b (commit)
via e5a0edf9aa58475aaa59e9a238374904d713182c (commit)
from 26e2f525f3a1a2904eb4e5e83a1667fef2cada78 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b396450d1c29148edcd9e468ca1775464151ed5b
Author: Fred Wright <address@hidden>
Date: Fri Mar 3 15:09:21 2017 -0800
Fixes broken build of www/hardware.html.
Commit 8200880a (polyglot rework) broke the build of hardware.html,
due to problems with default encodings in gpscap.py. This went
unnoticed for nearly a year since the 'www' target is not part of the
default build, and because the failure didn't propagate to an overall
build failure.
Since the intended encoding for both the input and output is UTF-8,
this is fixed by specifying that encoding explicitly. This needs to be
done in two places:
1) The invocation of the ConfigParser's read() method needs to specify
the encoding of the input. This argument isn't available in Python
2.6, so there's a fallback for that case (where it's unneeded).
2) The encoding of the piped output needs to be specified. This is
done by setting the PYTHONIOENCODING environment variable when running
gpscap.py.
TESTED:
Ran "scons build-all www check". Verified that the output looks
plausible in a browser, including the two umlauted characters.
Also verified that running gpscap.py standalone (with PYTHONIOENCODING
set) works correctly with all supported Python versions.
commit e5a0edf9aa58475aaa59e9a238374904d713182c
Author: Fred Wright <address@hidden>
Date: Fri Mar 3 15:37:04 2017 -0800
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.
-----------------------------------------------------------------------
Summary of changes:
SConstruct | 2 +-
gpscap.py | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
GPSD
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gpsd-commit-watch] [SCM] GPSD branch, master, updated. release-3.16-587-gb396450,
Fred Wright <=