[Python-modules-commits] r6250 - in packages/parallelpython/trunk/debian (3 files)

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

    Date: Tuesday, August 19, 2008 @ 23:14:13
  Author: morph-guest
Revision: 6250

backporting segfault fix

Added:
  packages/parallelpython/trunk/debian/patches/20_backport_segfault_fix.dpatch
Modified:
  packages/parallelpython/trunk/debian/changelog
  packages/parallelpython/trunk/debian/patches/00list

Modified: packages/parallelpython/trunk/debian/changelog
===================================================================
--- packages/parallelpython/trunk/debian/changelog	2008-08-19 23:09:05 UTC (rev 6249)
+++ packages/parallelpython/trunk/debian/changelog	2008-08-19 23:14:13 UTC (rev 6250)
@@ -1,3 +1,10 @@
+parallelpython (1.5.4-2) UNRELEASED; urgency=low
+
+  * debian/patches/20_backport_segfault_fix.dpatch
+    - backporting from 1.5.5: it fixed a segfault when calling destroy() method
+
+ -- Sandro Tosi <matrixhasu at gmail.com>  Wed, 20 Aug 2008 01:12:34 +0200
+
 parallelpython (1.5.4-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/parallelpython/trunk/debian/patches/00list
===================================================================
--- packages/parallelpython/trunk/debian/patches/00list	2008-08-19 23:09:05 UTC (rev 6249)
+++ packages/parallelpython/trunk/debian/patches/00list	2008-08-19 23:14:13 UTC (rev 6250)
@@ -1 +1,2 @@
 10_remove_default_password
+20_backport_segfault_fix

Added: packages/parallelpython/trunk/debian/patches/20_backport_segfault_fix.dpatch
===================================================================
--- packages/parallelpython/trunk/debian/patches/20_backport_segfault_fix.dpatch	                        (rev 0)
+++ packages/parallelpython/trunk/debian/patches/20_backport_segfault_fix.dpatch	2008-08-19 23:14:13 UTC (rev 6250)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_backport_segfault_fix.dpatch by Sandro Tosi <matrixhasu at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Backport from 1.5.5, fixes a segfault when calling destroy() method
+
+ at DPATCH@
+diff -urNad parallelpython~/pp.py parallelpython/pp.py
+--- parallelpython~/pp.py	2008-08-20 01:10:03.113518670 +0200
++++ parallelpython/pp.py	2008-08-20 01:11:45.999381802 +0200
+@@ -761,8 +761,12 @@
+     def destroy(self):
+         """Kills ppworkers and closes open files"""
+         self.__exiting = True
++        self.__queue_lock.acquire()
++        self.__queue = []
++        self.__queue_lock.release()
++
+         for worker in self.__workers:
+-            worker.t.close()
++            worker.t.exiting = True
+             if sys.platform.startswith("win"):
+                 os.popen('TASKKILL /PID '+str(worker.pid)+' /F')
+             else:


Property changes on: packages/parallelpython/trunk/debian/patches/20_backport_segfault_fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *