launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad-buildd/unset-env into lp:launchpad-buildd.

Commit message:
Unset LANG and LC_ALL rather than setting them to C, and unset a number of other environment variables too (including DISPLAY and TERM), in line with Debian buildds.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-buildd/unset-env/+merge/191783

This syncs up environment variable handling with Debian buildds, in particular fixing a failure of perl 5.18.1-4 when built from a launchpad-buildd instance that was restarted from an ssh session inside X and hence had TERM=xterm set.
-- 
https://code.launchpad.net/~cjwatson/launchpad-buildd/unset-env/+merge/191783
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad-buildd/unset-env into lp:launchpad-buildd.

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-10 15:02:24 +0000
+++ debian/changelog	2013-10-18 11:26:38 +0000
@@ -1,3 +1,11 @@
+launchpad-buildd (120) UNRELEASED; urgency=low
+
+  * Unset LANG and LC_ALL rather than setting them to C, and unset a number
+    of other environment variables too (including DISPLAY and TERM), in line
+    with Debian buildds.
+
+ -- Colin Watson <cjwatson@xxxxxxxxxx>  Fri, 18 Oct 2013 12:24:00 +0100
+
 launchpad-buildd (119) hardy; urgency=low
 
   * Mount /dev/pts with -o gid=5,mode=620 to avoid needing pt_chown.

=== modified file 'sbuild-package'
--- sbuild-package	2013-10-07 11:49:04 +0000
+++ sbuild-package	2013-10-18 11:26:38 +0000
@@ -15,7 +15,18 @@
 
 exec 2>&1
 
-export LANG=C LC_ALL=C 
+# Keep this in sync with sbuild/lib/Buildd.pm.
+unset LANG
+unset LC_ALL
+unset LC_COLLATE
+unset LC_CTYPE
+unset LC_MONETARY
+unset LC_MESSAGES
+unset LC_NUMERIC
+unset LC_TIME
+unset LANGUAGE
+unset DISPLAY
+unset TERM
 
 # On multi-guest PPA hosts, the per-guest overlay sometimes gets out of
 # sync, and we notice this by way of a corrupted .sbuildrc.  We aren't going