[Python-modules-commits] r6680 - in packages/pcapy/trunk/debian (2 files)

[arnau at users.alioth.debian.org]

    Date: Sunday, October 12, 2008 @ 15:40:05
  Author: arnau
Revision: 6680

Add 02_remove_exception_on_next.patch which returns None instead of
raising an exception when pcap_next() returns NULL. Closes: #500041.

Added:
  packages/pcapy/trunk/debian/patches/02_remove_exception_on_next.patch
Modified:
  packages/pcapy/trunk/debian/changelog

Modified: packages/pcapy/trunk/debian/changelog
===================================================================
--- packages/pcapy/trunk/debian/changelog	2008-10-12 13:36:57 UTC (rev 6679)
+++ packages/pcapy/trunk/debian/changelog	2008-10-12 15:40:05 UTC (rev 6680)
@@ -1,3 +1,10 @@
+pcapy (0.10.5-3) UNRELEASED; urgency=low
+
+  * Add 02_remove_exception_on_next.patch which returns None instead of
+    raising an exception when pcap_next() returns NULL. Closes: #500041.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Sun, 12 Oct 2008 16:26:38 +0100
+
 pcapy (0.10.5-2) unstable; urgency=low
 
   [ Arnaud Fontaine ]

Added: packages/pcapy/trunk/debian/patches/02_remove_exception_on_next.patch
===================================================================
--- packages/pcapy/trunk/debian/patches/02_remove_exception_on_next.patch	                        (rev 0)
+++ packages/pcapy/trunk/debian/patches/02_remove_exception_on_next.patch	2008-10-12 15:40:05 UTC (rev 6680)
@@ -0,0 +1,17 @@
+--- pcapy-0.10.5.orig/pcapobj.cc	2008-10-12 16:17:31.000000000 +0100
++++ pcapy-0.10.5/pcapobj.cc	2008-10-12 15:55:24.000000000 +0100
+@@ -208,10 +208,10 @@
+   Py_END_ALLOW_THREADS;
+ 
+   if(!buf)
+-    {
+-      PyErr_SetString(PcapError, pcap_geterr(pp->pcap));
+-      return NULL;
+-    }
++    // According to Pcap manpage, there is no way to determine whether
++    // an error occured or not when calling pcap_next, so just returns
++    // None
++    return Py_None;
+ 
+   PyObject *pkthdr = new_pcap_pkthdr(&hdr);
+