Launchpad itself

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

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

Commit message

Run lpjsmin with LC_ALL=C.UTF-8

Description of the change

As with my previous similar change for js-deps, this is because otherwise lpjsmin 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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 16a1b38..4b68d4c 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -236,7 +236,7 @@ $(LP_JS_BUILD): | $(JS_BUILD_DIR)
6 cp -a $$jsdir $@/$$app; \
7 done
8 find $@ -name 'tests' -type d | xargs rm -rf
9- bin/lpjsmin -p $@
10+ LC_ALL=C.UTF-8 bin/lpjsmin -p $@
11
12 jsbuild: $(LP_JS_BUILD) $(YUI_SYMLINK)
13 LC_ALL=C.UTF-8 utilities/js-deps -n LP_MODULES -s build/js/lp \

Subscribers

People subscribed via source and target branches

to status/vote changes: