[Python-apps-commits] r13847 - in packages/pelican/trunk/debian (2 files)

[vcheng at users.alioth.debian.org]

    Date: Thursday, January 5, 2017 @ 09:33:51
  Author: vcheng
Revision: 13847

update quickstart_attribute_error.patch

Modified:
  packages/pelican/trunk/debian/changelog
  packages/pelican/trunk/debian/patches/quickstart_attribute_error.patch

Modified: packages/pelican/trunk/debian/changelog
===================================================================
--- packages/pelican/trunk/debian/changelog	2017-01-05 09:26:14 UTC (rev 13846)
+++ packages/pelican/trunk/debian/changelog	2017-01-05 09:33:51 UTC (rev 13847)
@@ -1,8 +1,8 @@
-pelican (3.7.0-2) UNRELEASED; urgency=medium
+pelican (3.7.0-2) unstable; urgency=medium
 
-  * 
+  * Update debian/patches/quickstart_attribute_error.patch with upstream fix.
 
- -- Vincent Cheng <vcheng at debian.org>  Mon, 02 Jan 2017 13:50:22 -0800
+ -- Vincent Cheng <vcheng at debian.org>  Thu, 05 Jan 2017 01:33:02 -0800
 
 pelican (3.7.0-1) unstable; urgency=medium
 

Modified: packages/pelican/trunk/debian/patches/quickstart_attribute_error.patch
===================================================================
--- packages/pelican/trunk/debian/patches/quickstart_attribute_error.patch	2017-01-05 09:26:14 UTC (rev 13846)
+++ packages/pelican/trunk/debian/patches/quickstart_attribute_error.patch	2017-01-05 09:33:51 UTC (rev 13847)
@@ -14,17 +14,31 @@
    File "/usr/lib/python2.7/dist-packages/pelican/tools/pelican_quickstart.py", line 52, in <module>
      'lang': locale.getlocale()[0].split('_')[0],
  AttributeError: 'NoneType' object has no attribute 'split'
-Origin: https://github.com/getpelican/pelican/pull/2063
-Last-Update: 2017-01-02
+Origin: upstream, https://github.com/getpelican/pelican/commit/84920e8fdf754b642b9a137cad38c38f9417bde5
+Bug: https://github.com/getpelican/pelican/issues/2043
+Last-Update: 2017-01-05
 
 --- a/pelican/tools/pelican_quickstart.py
 +++ b/pelican/tools/pelican_quickstart.py
-@@ -49,7 +49,7 @@
+@@ -21,6 +21,12 @@
+ 
+ from pelican import __version__
+ 
++locale.setlocale(locale.LC_ALL, '')
++_DEFAULT_LANGUAGE = locale.getlocale()[0]
++if _DEFAULT_LANGUAGE is None:
++    _DEFAULT_LANGUAGE = 'English'
++else:
++    _DEFAULT_LANGUAGE = _DEFAULT_LANGUAGE.split('_')[0]
+ 
+ _TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)),
+                               "templates")
+@@ -49,7 +55,7 @@
      'github_pages_branch': _GITHUB_PAGES_BRANCHES['project'],
      'default_pagination': 10,
      'siteurl': '',
 -    'lang': locale.getlocale()[0].split('_')[0],
-+    'lang': locale.getlocale()[0].split('_')[0] if locale.getlocale()[0] is not None else None,
++    'lang': _DEFAULT_LANGUAGE,
      'timezone': _DEFAULT_TIMEZONE
  }