← Back to team overview

launchpad-reviewers team mailing list archive

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

 

Colin Watson has proposed merging ~cjwatson/launchpad:lpjsmin-utf8 into launchpad:master.

Commit message:
Run lpjsmin with LC_ALL=C.UTF-8

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/403210

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.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:lpjsmin-utf8 into launchpad:master.
diff --git a/Makefile b/Makefile
index 16a1b38..4b68d4c 100644
--- a/Makefile
+++ b/Makefile
@@ -236,7 +236,7 @@ $(LP_JS_BUILD): | $(JS_BUILD_DIR)
 		cp -a $$jsdir $@/$$app; \
 	done
 	find $@ -name 'tests' -type d | xargs rm -rf
-	bin/lpjsmin -p $@
+	LC_ALL=C.UTF-8 bin/lpjsmin -p $@
 
 jsbuild: $(LP_JS_BUILD) $(YUI_SYMLINK)
 	LC_ALL=C.UTF-8 utilities/js-deps -n LP_MODULES -s build/js/lp \