[Python-apps-commits] r5812 - in packages/pyrit/trunk/debian (3 files)

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

    Date: Friday, July 9, 2010 @ 18:44:15
  Author: chrisk-guest
Revision: 5812

Add patch to correctly handle multiple exceptions

Added:
  packages/pyrit/trunk/debian/patches/0009-exception-handling-fix.patch
Modified:
  packages/pyrit/trunk/debian/changelog
  packages/pyrit/trunk/debian/patches/series

Modified: packages/pyrit/trunk/debian/changelog
===================================================================
--- packages/pyrit/trunk/debian/changelog	2010-07-09 18:08:55 UTC (rev 5811)
+++ packages/pyrit/trunk/debian/changelog	2010-07-09 18:44:15 UTC (rev 5812)
@@ -10,5 +10,6 @@
     - 0006-custom-config-file
     - 0007-add-option-to-limit-cores
     - 0008-disable-optimizations-on-i386.patch
+    - 0009-exception-handling-fix.patch
 
  -- Christian Kastner <debian at kvr.at>  Thu, 20 May 2010 14:43:26 +0200

Added: packages/pyrit/trunk/debian/patches/0009-exception-handling-fix.patch
===================================================================
--- packages/pyrit/trunk/debian/patches/0009-exception-handling-fix.patch	                        (rev 0)
+++ packages/pyrit/trunk/debian/patches/0009-exception-handling-fix.patch	2010-07-09 18:44:15 UTC (rev 5812)
@@ -0,0 +1,30 @@
+From: Christian Kastner <debian at kvr.at>
+Date: Tue, 9 Jul 2010 20:34:27 +0200
+Subject: [PATCH] Correctly handle exceptions in pyrit_cli.py
+
+Jakub Wilk discovered a bug when handling multiple exceptions in pyrit_cli.py.
+
+Forwarded: yes
+Last-Update: 2010-07-09
+Index: pyrit-0.3.0/pyrit_cli.py
+===================================================================
+--- pyrit-0.3.0.orig/pyrit_cli.py	2010-07-09 20:33:06.437838810 +0200
++++ pyrit-0.3.0/pyrit_cli.py	2010-07-09 20:33:35.609842821 +0200
+@@ -601,7 +601,7 @@
+         self.tell("Server started...")
+         try:
+             rpcd.serve_forever()
+-        except KeyboardInterrupt, SystemExit:
++        except (KeyboardInterrupt, SystemExit):
+             pass
+         self.tell("Server closed")
+     relay.cli_options = (('-u', ), ())
+@@ -622,7 +622,7 @@
+                 else:
+                     y = 0
+                 self.tell("\rServing %i active clients; %i PMKs/s; %.1f TTS" % (len(server), perfcounter.avg, y), end=None)
+-        except KeyboardInterrupt, SystemExit:
++        except (KeyboardInterrupt, SystemExit):
+             self.tell("\nShutdown with %i active clients..." % len(server))
+             listener.shutdown()
+             server.shutdown()

Modified: packages/pyrit/trunk/debian/patches/series
===================================================================
--- packages/pyrit/trunk/debian/patches/series	2010-07-09 18:08:55 UTC (rev 5811)
+++ packages/pyrit/trunk/debian/patches/series	2010-07-09 18:44:15 UTC (rev 5812)
@@ -6,3 +6,4 @@
 0006-custom-config-file.patch
 0007-add-option-to-limit-cores.patch
 0008-disable-optimizations-on-i386.patch
+0009-exception-handling-fix.patch