[python-astropy] 01/01: Fix locale on build. This also shall trigger a rebuild for kfreebsd-i386 which died mysteriously.

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository python-astropy.

commit 4f43891edc89cf586feea6e13aad335045c78b41
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jul 18 10:39:34 2014 +0200

    Fix locale on build. This also shall trigger a rebuild for kfreebsd-i386 which died mysteriously.
---
 debian/changelog               |  6 ++++++
 debian/patches/fix_build.patch | 23 +++++++++++++++++++++++
 debian/patches/series          |  1 +
 debian/rules                   |  3 ---
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7d85bf..d4b4d76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-astropy (0.4-2) unstable; urgency=low
+
+  * Fix locale on build
+
+ -- Ole Streicher <debian at liska.ath.cx>  Fri, 18 Jul 2014 09:16:16 +0200
+
 python-astropy (0.4-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/patches/fix_build.patch b/debian/patches/fix_build.patch
new file mode 100644
index 0000000..6f5a61d
--- /dev/null
+++ b/debian/patches/fix_build.patch
@@ -0,0 +1,23 @@
+Author: Eric Bray
+Subject: Fix wrong encoding on build
+Bug: https://github.com/astropy/astropy/issues/2749
+--- a/ah_bootstrap.py
++++ b/ah_bootstrap.py
+@@ -429,7 +429,16 @@
+                 '`git submodule status` command:\n{0}'.format(str(e)))
+ 
+ 
+-    stdio_encoding = locale.getdefaultlocale()[1]
++    # Can fail of the default locale is not configured properly.  See
++    # https://github.com/astropy/astropy/issues/2749.  For the purposes under
++    # consideration 'latin1' is an acceptable fallback.
++    try:
++        stdio_encoding = locale.getdefaultlocale()[1] or 'latin1'
++    except ValueError:
++        # Due to an OSX oddity locale.getdefaultlocale() can also crash
++        # depending on the user's locale/language settings.  See:
++        # http://bugs.python.org/issue18378
++        stdio_encoding = 'latin1'
+ 
+     if p.returncode != 0 or stderr:
+         stderr = stderr.decode(stdio_encoding)
diff --git a/debian/patches/series b/debian/patches/series
index a0afe8e..17039d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 mark_known_failures.patch
 use_extern_ply.patch
+fix_build.patch
diff --git a/debian/rules b/debian/rules
index 6b543cd..4b471e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,9 +10,6 @@ export MPLCONFIGDIR=$(CURDIR)/build
 # Prevent setuptools/distribute from accessing the internet.
 export http_proxy = http://127.0.9.1:9
 
-# See https://github.com/astropy/astropy/issues/2749
-export LC_ALL=C.UTF-8
-
 %:
 	dh $@ --with python2,python3,sphinxdoc
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/python-astropy.git