[Python-modules-commits] r6249 - in packages/parallelpython/trunk/debian (2 files)

morph-guest at users.alioth.debian.org morph-guest at users.alioth.debian.org
Tue Aug 19 23:09:06 UTC 2008


    Date: Tuesday, August 19, 2008 @ 23:09:05
  Author: morph-guest
Revision: 6249

reverted changes to 1.5.4-1, I'll release a -2

Modified:
  packages/parallelpython/trunk/debian/changelog
  packages/parallelpython/trunk/debian/patches/10_remove_default_password.dpatch

Modified: packages/parallelpython/trunk/debian/changelog
===================================================================
--- packages/parallelpython/trunk/debian/changelog	2008-08-19 22:18:28 UTC (rev 6248)
+++ packages/parallelpython/trunk/debian/changelog	2008-08-19 23:09:05 UTC (rev 6249)
@@ -1,11 +1,3 @@
-parallelpython (1.5.5-1) UNRELEASED; urgency=low
-
-  * New upstream release
-  * debian/patches/10_remove_default_password.dpatch
-    - adapted to new upstream code
-
- -- Sandro Tosi <matrixhasu at gmail.com>  Sat, 16 Aug 2008 23:04:32 +0200
-
 parallelpython (1.5.4-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/parallelpython/trunk/debian/patches/10_remove_default_password.dpatch
===================================================================
--- packages/parallelpython/trunk/debian/patches/10_remove_default_password.dpatch	2008-08-19 22:18:28 UTC (rev 6248)
+++ packages/parallelpython/trunk/debian/patches/10_remove_default_password.dpatch	2008-08-19 23:09:05 UTC (rev 6249)
@@ -6,29 +6,29 @@
 
 @DPATCH@
 diff -urNad parallelpython~/pp.py parallelpython/pp.py
---- 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 @@
+--- 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 @@
      """
  
      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):
-@@ -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 @@
+@@ -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 @@
                  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-08-12 18:40:52.000000000 +0200
-+++ parallelpython/ppdoc.html	2008-08-16 23:08:47.331929304 +0200
+--- parallelpython~/ppdoc.html	2008-06-03 05:48:16.000000000 +0200
++++ parallelpython/ppdoc.html	2008-06-07 14:12:29.771908722 +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">&nbsp;<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">&nbsp;&nbsp;&nbsp;</td> <td colspan="2"><a href="#Template">Template</a>&nbsp;class<br />&nbsp;</td></tr>  <tr><td>&nbsp;</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">=&#39;default&#39;</font>, globals<font color="#909090">=None</font>)</dt><dd>Creates&nbsp;<a href="#Template">Template</a>&nbsp;instance<br />  &nbsp;<br /> jobs_server&nbsp;-&nbsp;pp&nbsp;server&nbsp;for&nbsp;submitting&nbsp;jobs<br /> func&nbsp;-&nbsp;function&nbsp;to&nbsp;be&nbsp;executed<br /> depfuncs&nbsp;-&nbsp;tuple&nbsp;with&nbsp;functions&nbsp;which&nbsp;might&nbsp;be&nbsp;called&nbsp;from&nbsp;&#39;func&#39;<br />  modules&nbsp;-&nbsp;tuple&nbsp;with&nbsp;module&nbsp;names&nbsp;to&nbsp;import<br /> callback&nbsp;-&nbsp;callback&nbsp;function&nbsp;which&nbsp;will&nbsp;be&nbsp;called&nbsp;with&nbsp;argument&nbsp;<br />  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;list&nbsp;equal&nbsp;to&nbsp;callbackargs+(result,)&nbsp;<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;as&nbsp;soon&nbsp;as&nbsp;calculation&nbsp;is&nbsp;done<br /> callbackargs&nbsp;-&nbsp;additional&nbsp;arguments&nbsp;for&nbsp;callback&nbsp;function<br />  group&nbsp;-&nbsp;job&nbsp;group,&nbsp;is&nbsp;used&nbsp;when&nbsp;wait(group)&nbsp;is&nbsp;called&nbsp;to&nbsp;wait&nbsp;for<br /> jobs&nbsp;in&nbsp;a&nbsp;given&nbsp;group&nbsp;to&nbsp;finish<br />  globals&nbsp;-&nbsp;dictionary&nbsp;from&nbsp;which&nbsp;all&nbsp;modules,&nbsp;functions&nbsp;and&nbsp;classes<br /> will&nbsp;be&nbsp;imported,&nbsp;for&nbsp;instance:&nbsp;globals=globals()</dd></dl>  <dl><dt><a name="Template-submit" title="Template-submit"></a><strong>submit</strong>(self, *args)</dt><dd>Submits&nbsp;function&nbsp;with&nbsp;*arg&nbsp;arguments&nbsp;to&nbsp;the&nbsp;execution&nbsp;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-08-16 23:08:47.331929304 +0200
++++ parallelpython/ppserver.1	2008-06-07 14:11:16.975760308 +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-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,
+--- 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, 
                  timeout=None, loglevel=logging.WARNING):
 -        Server.__init__(self, ncpus, secret=secret, loglevel=loglevel)
 +	try:




More information about the Python-modules-commits mailing list