Catch the right error

jenshnielsen · jenshnielsen · commit cbddb9938520 · 2014-10-30T17:40:54.000Z
diff --git a/setupext.py b/setupext.py
@@ -13,7 +13,6 @@
 import warnings
 from textwrap import fill
 
-
 PY3 = (sys.version_info[0] >= 3)
 
 
@@ -1789,12 +1788,12 @@ def check_requirements(self):
             return "unknown (can not use multiprocessing to determine)"
         try:
             res = p.map_async(backend_gtk3agg_internal_check, [0])
-            success, msg = res.get(timeout=5)[0]
-        except Queue.Empty:
+            success, msg = res.get(timeout=10)[0]
+        except multiprocessing.TimeoutError:
             p.terminate()
             # No result returned. Probaly hanging, terminate the process.
             success = False
-            raise
+            raise CheckFailed("Check timed out")
         except:
             p.close()
             # Some other error.
@@ -1864,12 +1863,12 @@ def check_requirements(self):
             return "unknown (can not use multiprocessing to determine)"
         try:
             res = p.map_async(backend_gtk3cairo_internal_check, [0])
-            success, msg = res.get(timeout=5)[0]
-        except Queue.Empty:
+            success, msg = res.get(timeout=10)[0]
+        except multiprocessing.TimeoutError:
             p.terminate()
             # No result returned. Probaly hanging, terminate the process.
             success = False
-            raise
+            raise CheckFailed("Check timed out")
         except:
             p.close()
             success = False
@@ -2012,11 +2011,11 @@ def check_requirements(self):
             # Multiprocessing OK
             try:
                 res = p.map_async(self.callback, [self])
-                msg = res.get(timeout=5)[0]
-            except Queue.Empty:
+                msg = res.get(timeout=10)[0]
+            except multiprocessing.TimeoutError:
                 p.terminate()
                 # No result returned. Probaly hanging, terminate the process.
-                raise
+                raise CheckFailed("Check timed out")
             except:
                 # Some other error.
                 p.close()
