← Back to team overview

launchpad-reviewers team mailing list archive

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

 

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

Commit message:
Run js-deps 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/403051

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.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:convoy-utf8 into launchpad:master.
diff --git a/Makefile b/Makefile
index 17df062..16a1b38 100644
--- a/Makefile
+++ b/Makefile
@@ -239,8 +239,8 @@ $(LP_JS_BUILD): | $(JS_BUILD_DIR)
 	bin/lpjsmin -p $@
 
 jsbuild: $(LP_JS_BUILD) $(YUI_SYMLINK)
-	utilities/js-deps -n LP_MODULES -s build/js/lp -x '-min.js' -o \
-	build/js/lp/meta.js >/dev/null
+	LC_ALL=C.UTF-8 utilities/js-deps -n LP_MODULES -s build/js/lp \
+		-x '-min.js' -o build/js/lp/meta.js >/dev/null
 	utilities/check-js-deps
 
 requirements/combined.txt: \