[Python-modules-commits] [sphinx] 01/01: Backport upstream patch to fix crash with new python2.7.

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch debian/master
in repository sphinx.

commit 954e0d069ebbd8a027e1f9331530a4ae165dda82
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Sep 17 17:10:41 2017 +0300

    Backport upstream patch to fix crash with new python2.7.
    
    Closes: #869098.
---
 debian/changelog                                    |  2 ++
 debian/patches/series                               |  1 +
 .../upstream_fix_crash_on_parallel_build.diff       | 21 +++++++++++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3e4d223..f145c0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ sphinx (1.6.3-2) UNRELEASED; urgency=medium
 
   * Move sphinxcontrib-websupport from requirements to extras_require
     in setuptools metadata (no_require_websupport.diff).
+  * Backport upstream patch to fix crash with new python2.7
+    (upstream_fix_crash_on_parallel_build.diff; closes: #869098).
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 19 Aug 2017 18:30:31 +0300
 
diff --git a/debian/patches/series b/debian/patches/series
index 609a68b..762b03b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ disable_js_version_check.diff
 no_snowballstemmer.diff
 skip_tests_network.diff
 no_require_websupport.diff
+upstream_fix_crash_on_parallel_build.diff
diff --git a/debian/patches/upstream_fix_crash_on_parallel_build.diff b/debian/patches/upstream_fix_crash_on_parallel_build.diff
new file mode 100644
index 0000000..915f462
--- /dev/null
+++ b/debian/patches/upstream_fix_crash_on_parallel_build.diff
@@ -0,0 +1,21 @@
+From: Takeshi KOMIYA <i.tkomiya at gmail.com>
+Date: Tue, 5 Sep 2017 01:37:33 +0900
+Subject: Fix #4006: Fix crash on parallel build
+
+(cherry picked from commit 0cb57f19a099be2809a8fb5dc9274f7411e1caac)
+---
+ sphinx/util/parallel.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sphinx/util/parallel.py b/sphinx/util/parallel.py
+index 7ca4e94..9bc3c36 100644
+--- a/sphinx/util/parallel.py
++++ b/sphinx/util/parallel.py
+@@ -122,6 +122,7 @@ class ParallelTasks(object):
+                     logger.handle(log)
+                 self._result_funcs.pop(tid)(self._args.pop(tid), result)
+                 self._procs[tid].join()
++                self._precvs.pop(tid)
+                 self._pworking -= 1
+                 break
+         else:

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