[Python-modules-commits] r10233 - in packages/parallelpython/trunk/debian/patches (1 file)

[morph at users.alioth.debian.org]

    Date: Saturday, October 31, 2009 @ 20:49:47
  Author: morph
Revision: 10233

real working patch

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

Modified: packages/parallelpython/trunk/debian/patches/10_remove_default_password.dpatch
===================================================================
--- packages/parallelpython/trunk/debian/patches/10_remove_default_password.dpatch	2009-10-30 09:05:06 UTC (rev 10232)
+++ packages/parallelpython/trunk/debian/patches/10_remove_default_password.dpatch	2009-10-31 20:49:47 UTC (rev 10233)
@@ -8,7 +8,7 @@
 @DPATCH@
 diff -urNad parallelpython~/doc/ppdoc.html parallelpython/doc/ppdoc.html
 --- parallelpython~/doc/ppdoc.html	2009-02-23 10:00:09.000000000 +0100
-+++ parallelpython/doc/ppdoc.html	2009-03-05 23:47:57.362380774 +0100
++++ parallelpython/doc/ppdoc.html	2009-10-31 21:42:03.434067812 +0100
 @@ -42,7 +42,7 @@
  -s secret          : secret for authentication
  -t seconds         : timeout to exit if no connections with clients exist
@@ -20,7 +20,7 @@
  		</tr>
 diff -urNad parallelpython~/pp.py parallelpython/pp.py
 --- parallelpython~/pp.py	2009-02-24 07:34:00.000000000 +0100
-+++ parallelpython/pp.py	2009-03-05 23:40:09.438381229 +0100
++++ parallelpython/pp.py	2009-10-31 21:42:03.434067812 +0100
 @@ -274,7 +274,6 @@
      """
  
@@ -41,30 +41,18 @@
             loglevel - logging level
             logstream - log stream destination
             restart - wheather to restart worker process after each task completion
-@@ -365,7 +363,7 @@
+@@ -360,12 +358,12 @@
                  raise TypeError("secret must be of a string type")
              self.secret = str(secret)
+         elif hasattr(user, "pp_secret"):
+-            secret = user["pp_secret"]
++            secret = user.pp_secret
+             if not isinstance(secret, types.StringType):
+                 raise TypeError("secret must be of a string type")
+             self.secret = str(secret)
          else:
 -            self.secret = Server.default_secret
 +            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"
-diff -urNad parallelpython~/ppserver.py parallelpython/ppserver.py
---- parallelpython~/ppserver.py	2009-02-23 10:04:29.000000000 +0100
-+++ parallelpython/ppserver.py	2009-03-05 23:43:13.162381054 +0100
-@@ -66,8 +66,12 @@
-                 broadcast="255.255.255.255", port=None, secret=None,
-                 timeout=None, loglevel=logging.WARNING, restart=False,
-                 proto=0):
--        Server.__init__(self, ncpus, secret=secret, loglevel=loglevel,
--                restart=restart, proto=proto)
-+        try:
-+            Server.__init__(self, ncpus, secret=secret, loglevel=loglevel,
-+                    restart=restart, proto=proto)
-+        except Exception, e:
-+            print >> sys.stderr, str(e)
-+            sys.exit(1)
-         self.host = interface
-         self.bcast = broadcast
-         if port is not None: