[Python-modules-commits] r6253 - in packages/parallelpython/trunk/debian (4 files)
morph-guest at users.alioth.debian.org
morph-guest at users.alioth.debian.org
Tue Aug 19 23:39:02 UTC 2008
Date: Tuesday, August 19, 2008 @ 23:39:00
Author: morph-guest
Revision: 6253
reapplied 1.5.5 changes; droppe 20_backport_segfault_fix.dpatch; waiting for RT reply to upload in experimental
Modified:
packages/parallelpython/trunk/debian/changelog
packages/parallelpython/trunk/debian/patches/00list
packages/parallelpython/trunk/debian/patches/10_remove_default_password.dpatch
Deleted:
packages/parallelpython/trunk/debian/patches/20_backport_segfault_fix.dpatch
Modified: packages/parallelpython/trunk/debian/changelog
===================================================================
--- packages/parallelpython/trunk/debian/changelog 2008-08-19 23:34:34 UTC (rev 6252)
+++ packages/parallelpython/trunk/debian/changelog 2008-08-19 23:39:00 UTC (rev 6253)
@@ -1,3 +1,13 @@
+parallelpython (1.5.5-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * debian/patches/10_remove_default_password.dpatch
+ - adapted to new upstream code
+ * debian/patches/20_backport_segfault_fix.dpatch
+ - removed, it was backported from this release
+
+ -- Sandro Tosi <matrixhasu at gmail.com> Wed, 20 Aug 2008 01:36:50 +0200
+
parallelpython (1.5.4-2) unstable; urgency=low
* debian/patches/20_backport_segfault_fix.dpatch
Modified: packages/parallelpython/trunk/debian/patches/00list
===================================================================
--- packages/parallelpython/trunk/debian/patches/00list 2008-08-19 23:34:34 UTC (rev 6252)
+++ packages/parallelpython/trunk/debian/patches/00list 2008-08-19 23:39:00 UTC (rev 6253)
@@ -1,2 +1 @@
10_remove_default_password
-20_backport_segfault_fix
Modified: packages/parallelpython/trunk/debian/patches/10_remove_default_password.dpatch
===================================================================
--- packages/parallelpython/trunk/debian/patches/10_remove_default_password.dpatch 2008-08-19 23:34:34 UTC (rev 6252)
+++ packages/parallelpython/trunk/debian/patches/10_remove_default_password.dpatch 2008-08-19 23:39:00 UTC (rev 6253)
@@ -6,29 +6,29 @@
@DPATCH@
diff -urNad parallelpython~/pp.py parallelpython/pp.py
---- parallelpython~/pp.py 2008-06-02 19:06:30.000000000 +0200
-+++ parallelpython/pp.py 2008-06-07 14:09:11.524611254 +0200
-@@ -227,7 +227,6 @@
+--- parallelpython~/pp.py 2008-08-12 18:27:10.000000000 +0200
++++ parallelpython/pp.py 2008-08-16 23:10:52.851082230 +0200
+@@ -237,7 +237,6 @@
"""
default_port = 60000
- default_secret = "epo20pdosl;dksldkmm"
- def __init__(self, ncpus="autodetect", ppservers=(), secret=None,
+ def __init__(self, ncpus="autodetect", ppservers=(), secret=None,
loglevel=logging.WARNING, logstream=sys.stderr):
-@@ -238,9 +237,8 @@
- the number of processors in the system
- ppservers - list of active parallel python execution servers
- to connect with
-- secret - passphrase for network connections, if omitted a default
-- passphrase will be used. It's highly recommended to use a
-- custom passphrase for all network connections.
-+ secret - passphrase for network connections; it can be set via
-+ command-line or configuration file
- loglevel - logging level
- logstream - log stream destination
-
-@@ -311,7 +309,7 @@
+@@ -248,9 +247,8 @@
+ the number of processors in the system
+ ppservers - list of active parallel python execution servers
+ to connect with
+- secret - passphrase for network connections, if omitted a default
+- passphrase will be used. It's highly recommended to use a
+- custom passphrase for all network connections.
++ secret - passphrase for network connections; it can be set via
++ command-line or configuration file
+ loglevel - logging level
+ logstream - log stream destination
+
+@@ -321,7 +319,7 @@
raise TypeError("secret must be of a string type")
self.secret = str(secret)
else:
@@ -36,10 +36,10 @@
+ raise ValueError("secret must be set using command-line option or configuration file")
self.__connect()
self.__creation_time = time.time()
- logging.info("pp local server started with %d workers"
+ logging.info("pp local server started with %d workers"
diff -urNad parallelpython~/ppdoc.html parallelpython/ppdoc.html
---- parallelpython~/ppdoc.html 2008-06-03 05:48:16.000000000 +0200
-+++ parallelpython/ppdoc.html 2008-06-07 14:12:29.771908722 +0200
+--- parallelpython~/ppdoc.html 2008-08-12 18:40:52.000000000 +0200
++++ parallelpython/ppdoc.html 2008-08-16 23:08:47.331929304 +0200
@@ -22,7 +22,7 @@
<p> <table border="0" cellspacing="0" cellpadding="2" width="100%" summary="section"> <tbody><tr bgcolor="#ffc8d8"> <td colspan="3" valign="bottom"> <br /> <font face="helvetica, arial" color="#000000"><a name="Template" title="Template"></a>class <strong>Template</strong></font></td></tr> <tr bgcolor="#ffc8d8"><td rowspan="2"> </td> <td colspan="2"><a href="#Template">Template</a> class<br /> </td></tr> <tr><td> </td> <td width="100%">Methods defined here:<br /> <dl><dt><a name="Template-__init__" title="Template-__init__"></a><strong>__init__</strong>(self, job_server, func, depfuncs<font color="#909090">=()</font>, modules<font color="#909090">=()</font>, callback<font color="#909090">=None</font>, callbackargs<font color="#909090">=()</font>, group<font color="#909090">='default'</font>, globals<font color="#909090">=None</font>)</dt><dd>Creates <a href="#Template">Template</a> instance<br /> <br /> jobs_server - pp server for submitting jobs<br /> func - function to be executed<br /> depfuncs - tuple with functions which might be called from 'func'<br /> modules - tuple with module names to import<br /> callback - callback function which will be called with argument <br /> list equal to callbackargs+(result,) <br /> as soon as calculation is done<br /> callbackargs - additional arguments for callback function<br /> group - job group, is used when wait(group) is called to wait for<br /> jobs in a given group to finish<br /> globals - dictionary from which all modules, functions and classes<br /> will be imported, for instance: globals=globals()</dd></dl> <dl><dt><a name="Template-submit" title="Template-submit"></a><strong>submit</strong>(self, *args)</dt><dd>Submits function with *arg arguments to the execution queue</dd></dl> </td></tr></tbody></table></p>
@@ -51,7 +51,7 @@
</tr>
diff -urNad parallelpython~/ppserver.1 parallelpython/ppserver.1
--- parallelpython~/ppserver.1 2008-06-03 05:48:34.000000000 +0200
-+++ parallelpython/ppserver.1 2008-06-07 14:11:16.975760308 +0200
++++ parallelpython/ppserver.1 2008-08-16 23:08:47.331929304 +0200
@@ -40,12 +40,11 @@
documentation, examples and support forums
.br
@@ -71,11 +71,11 @@
This manual page was written by Sandro Tosi <matrixhasu at gmail.com>,
for the Debian project (but may be used by others).
diff -urNad parallelpython~/ppserver.py parallelpython/ppserver.py
---- parallelpython~/ppserver.py 2008-06-02 19:07:29.000000000 +0200
-+++ parallelpython/ppserver.py 2008-06-07 14:09:11.528611484 +0200
-@@ -45,7 +45,11 @@
- def __init__(self, ncpus="autodetect", interface="0.0.0.0",
- broadcast="255.255.255.255", port=None, secret=None,
+--- parallelpython~/ppserver.py 2008-08-12 18:27:19.000000000 +0200
++++ parallelpython/ppserver.py 2008-08-16 23:08:47.331929304 +0200
+@@ -56,7 +56,11 @@
+ def __init__(self, ncpus="autodetect", interface="0.0.0.0",
+ broadcast="255.255.255.255", port=None, secret=None,
timeout=None, loglevel=logging.WARNING):
- Server.__init__(self, ncpus, secret=secret, loglevel=loglevel)
+ try:
Deleted: packages/parallelpython/trunk/debian/patches/20_backport_segfault_fix.dpatch
===================================================================
--- packages/parallelpython/trunk/debian/patches/20_backport_segfault_fix.dpatch 2008-08-19 23:34:34 UTC (rev 6252)
+++ packages/parallelpython/trunk/debian/patches/20_backport_segfault_fix.dpatch 2008-08-19 23:39:00 UTC (rev 6253)
@@ -1,24 +0,0 @@
-#! /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:
More information about the Python-modules-commits
mailing list