[Python-modules-commits] r31307 - in packages/matplotlib/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Wednesday, October 29, 2014 @ 23:17:37
  Author: morph
Revision: 31307

* debian/patches/1a182a98f76ce8c624bbaf3882e40d799e867338.patch
  - fix a possible deadlock when identifying Qt backends; thanks to Julien
    Cristau for the report; Closes: #767210

Added:
  packages/matplotlib/trunk/debian/patches/1a182a98f76ce8c624bbaf3882e40d799e867338.patch
Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/patches/series

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2014-10-29 01:29:32 UTC (rev 31306)
+++ packages/matplotlib/trunk/debian/changelog	2014-10-29 23:17:37 UTC (rev 31307)
@@ -1,3 +1,11 @@
+matplotlib (1.4.2-2) UNRELEASED; urgency=medium
+
+  * debian/patches/1a182a98f76ce8c624bbaf3882e40d799e867338.patch
+    - fix a possible deadlock when identifying Qt backends; thanks to Julien
+      Cristau for the report; Closes: #767210
+
+ -- Sandro Tosi <morph at debian.org>  Wed, 29 Oct 2014 23:16:48 +0000
+
 matplotlib (1.4.2-1) unstable; urgency=medium
 
   * New upstream release

Added: packages/matplotlib/trunk/debian/patches/1a182a98f76ce8c624bbaf3882e40d799e867338.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/1a182a98f76ce8c624bbaf3882e40d799e867338.patch	                        (rev 0)
+++ packages/matplotlib/trunk/debian/patches/1a182a98f76ce8c624bbaf3882e40d799e867338.patch	2014-10-29 23:17:37 UTC (rev 31307)
@@ -0,0 +1,31 @@
+From 1a182a98f76ce8c624bbaf3882e40d799e867338 Mon Sep 17 00:00:00 2001
+From: Jens Hedegaard Nielsen <jens.nielsen at ucl.ac.uk>
+Date: Wed, 29 Oct 2014 19:32:42 +0000
+Subject: [PATCH] Use map_async and get to avoid a deadlock
+
+---
+ setupext.py | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+--- a/setupext.py
++++ b/setupext.py
+@@ -1843,7 +1843,8 @@ class BackendGtk3Cairo(OptionalBackendPa
+             p = multiprocessing.Pool()
+         except:
+             return "unknown (can not use multiprocessing to determine)"
+-        success, msg = p.map(backend_gtk3cairo_internal_check, [0])[0]
++        res = p.map_async(backend_gtk3cairo_internal_check, [0])
++        success, msg = res.get(timeout=5)[0]
+         p.close()
+         p.join()
+         if success:
+@@ -1979,7 +1980,8 @@ class BackendQtBase(OptionalBackendPacka
+         else:
+             # Multiprocessing OK
+             try:
+-                msg = p.map(self.callback, [self])[0]
++                res = p.map_async(self.callback, [self])
++                msg = res.get(timeout=5)[0]
+             except:
+                 # If we hit an error on multiprocessing raise it
+                 raise

Modified: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series	2014-10-29 01:29:32 UTC (rev 31306)
+++ packages/matplotlib/trunk/debian/patches/series	2014-10-29 23:17:37 UTC (rev 31307)
@@ -6,3 +6,4 @@
 multiarch-tktcl.patch
 gtk3agg_check_no-multiprocessing.patch
 gtk3cairo_check_no-multiprocessing.patch
+1a182a98f76ce8c624bbaf3882e40d799e867338.patch