Launchpad itself

Merge ~cjwatson/launchpad:convoy-utf8 into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. convoy-utf8
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: eff0a4dc650921f2c388aac99339958fb6bbffe8
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:convoy-utf8
Merge into: launchpad:master
Diff against target: 15 lines (+2/-2)
1 file modified
Makefile (+2/-2)
Reviewer Review Type Date Requested Status
Tom Wardill (community) Approve
Ioana Lasc (community) Approve
Review via email: mp+403051@code.launchpad.net

Commit message

Run js-deps with LC_ALL=C.UTF-8

Description of the change

Otherwise convoy.meta sometimes gets confused on Python 3 (before 3.7) due to trying to read Unicode data using a non-UTF-8 locale.

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) :
review: Approve
Revision history for this message
Tom Wardill (twom) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 17df062..16a1b38 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -239,8 +239,8 @@ $(LP_JS_BUILD): | $(JS_BUILD_DIR)
6 bin/lpjsmin -p $@
7
8 jsbuild: $(LP_JS_BUILD) $(YUI_SYMLINK)
9- utilities/js-deps -n LP_MODULES -s build/js/lp -x '-min.js' -o \
10- build/js/lp/meta.js >/dev/null
11+ LC_ALL=C.UTF-8 utilities/js-deps -n LP_MODULES -s build/js/lp \
12+ -x '-min.js' -o build/js/lp/meta.js >/dev/null
13 utilities/check-js-deps
14
15 requirements/combined.txt: \

Subscribers

People subscribed via source and target branches

to status/vote changes: