[Python-modules-commits] r26904 - in packages/sphinx/trunk/debian (3 files)

[mitya57-guest at users.alioth.debian.org]

    Date: Friday, December 27, 2013 @ 17:35:32
  Author: mitya57-guest
Revision: 26904

Backport upstream patch (fix_jinja_recursion.diff) to fix infinite
recursion when building python-numpy docs.

Added:
  packages/sphinx/trunk/debian/patches/fix_jinja_recursion.diff
Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/series

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2013-12-27 15:19:05 UTC (rev 26903)
+++ packages/sphinx/trunk/debian/changelog	2013-12-27 17:35:32 UTC (rev 26904)
@@ -1,3 +1,10 @@
+sphinx (1.2+dfsg-2) UNRELEASED; urgency=medium
+
+  * Backport upstream patch (fix_jinja_recursion.diff) to fix infinite
+    recursion when building python-numpy docs.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Fri, 27 Dec 2013 21:34:47 +0400
+
 sphinx (1.2+dfsg-1) unstable; urgency=low
 
   * Upload to unstable.

Added: packages/sphinx/trunk/debian/patches/fix_jinja_recursion.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/fix_jinja_recursion.diff	                        (rev 0)
+++ packages/sphinx/trunk/debian/patches/fix_jinja_recursion.diff	2013-12-27 17:35:32 UTC (rev 26904)
@@ -0,0 +1,20 @@
+Description: fix infinite recursion in BuiltinTemplateLoader in jinja2glue.py
+Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/commits/edcb9911521aa8
+Last-Update: 2013-12-27
+
+--- a/sphinx/jinja2glue.py
++++ b/sphinx/jinja2glue.py
+@@ -95,9 +95,11 @@
+             # then the theme parent paths
+             loaderchain = pathchain + theme.themepath
+         elif dirs:
+-            pathchain = loaderchain = list(dirs)
++            pathchain = list(dirs)
++            loaderchain = list(dirs)
+         else:
+-            pathchain = loaderchain = []
++            pathchain = []
++            loaderchain = []
+ 
+         # prepend explicit template paths
+         self.templatepathlen = len(builder.config.templates_path)

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2013-12-27 15:19:05 UTC (rev 26903)
+++ packages/sphinx/trunk/debian/patches/series	2013-12-27 17:35:32 UTC (rev 26904)
@@ -5,3 +5,4 @@
 python3_test_build_dir.diff
 parallel_2to3.diff
 no_external_css.diff
+fix_jinja_recursion.diff