This is an automated email from the git hooks/post-receive script. jamessan pushed a commit to branch master in repository devscripts.
commit 87f8e347bebd4c6daaf3f109e3d956b2486d2b29 Author: James McCoy <[email protected]> Date: Sat Dec 5 08:37:02 2015 -0500 test_mk-origtargz: LANG → LC_ALL LANG can still be overridden if specific LC_* environment variables are present. LC_ALL rules them all. Signed-off-by: James McCoy <[email protected]> --- debian/changelog | 2 +- test/test_mk-origtargz | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 06ba13b..1bb7e60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -105,7 +105,7 @@ devscripts (2.15.10) UNRELEASED; urgency=medium + Fix parsing of sources.list lines with options. (Closes: #674812) * Add apt to Recommends, since various scripts use tools from apt. (Closes: #807065) - * Export LANG=C in test_mk-origtargz so the test doesn't fail in non-English + * Export LC_ALL=C in test_mk-origtargz so the test doesn't fail in non-English locales. [ Daniel Kahn Gillmor ] diff --git a/test/test_mk-origtargz b/test/test_mk-origtargz index a8efdc5..a4eaf06 100755 --- a/test/test_mk-origtargz +++ b/test/test_mk-origtargz @@ -28,13 +28,13 @@ fi cleanup(){ rm -rf $TMPDIR - unset LANG + unset LC_ALL } setUp () { TMPDIR=$(mktemp -d test_mk-origtargz.XXXX) - LANG=C - export LANG + LC_ALL=C + export LC_ALL } tearDown () { @@ -163,7 +163,7 @@ END expected_stderr_after_removal="WARNING: Files-Excluded pattern (exclude-dir2/) should not have a trailing /" -expected_files_after_removal=$(LANG=C sort <<END +expected_files_after_removal=$(LC_ALL=C sort <<END foo-0.1/ foo-0.1/a-dir/ foo-0.1/a-dir/exclude-this-subdir/ @@ -195,7 +195,7 @@ run_mk_origtargz() { shift shift shift - output="$( cd $TMPDIR/$dir >/dev/null; LANG=C $MK_ORIGTARGZ "$@" 2> $stderrF )" + output="$( cd $TMPDIR/$dir >/dev/null; LC_ALL=C $MK_ORIGTARGZ "$@" 2> $stderrF )" stderr="$(cat $stderrF)" retval=$? assertEquals "standard output of mk-origtargz $*\n" "$exp_stdout" "$output" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
