[Python-modules-commits] r25417 - in packages/python-dns/trunk/debian (5 files)

[kitterman at users.alioth.debian.org]

    Date: Wednesday, August 7, 2013 @ 03:25:57
  Author: kitterman
Revision: 25417

* Add debian/patches/pydns_timeout.patch to fix timeouts associated with
  only one of several available nameservers being unavailable
  (Closes: #718547):
  - Only raise timeout error after trying all available servers
  - Stop lookups once an answer is gotten
* Bump compat to 8 and debhelper build-dep to 8.1 for build-arch/indep
  support
* Bump standards version to 3.9.4 without further change

Added:
  packages/python-dns/trunk/debian/patches/pydns_timeout.patch
Modified:
  packages/python-dns/trunk/debian/changelog
  packages/python-dns/trunk/debian/compat
  packages/python-dns/trunk/debian/control
  packages/python-dns/trunk/debian/patches/series

Modified: packages/python-dns/trunk/debian/changelog
===================================================================
--- packages/python-dns/trunk/debian/changelog	2013-08-06 21:57:51 UTC (rev 25416)
+++ packages/python-dns/trunk/debian/changelog	2013-08-07 03:25:57 UTC (rev 25417)
@@ -1,10 +1,21 @@
-python-dns (2.3.6-2) UNRELEASED; urgency=low
+python-dns (2.3.6-2) unstable; urgency=low
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
   * Fix a typo in README.source.
 
- -- Jakub Wilk <jwilk at debian.org>  Wed, 12 Jun 2013 01:44:24 +0200
+  [ Scott Kitterman ]
+  * Add debian/patches/pydns_timeout.patch to fix timeouts associated with
+    only one of several available nameservers being unavailable
+    (Closes: #718547):
+    - Only raise timeout error after trying all available servers
+    - Stop lookups once an answer is gotten
+  * Bump compat to 8 and debhelper build-dep to 8.1 for build-arch/indep
+    support
+  * Bump standards version to 3.9.4 without further change
 
+ -- Scott Kitterman <scott at kitterman.com>  Tue, 06 Aug 2013 23:09:05 -0400
+
 python-dns (2.3.6-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/python-dns/trunk/debian/compat
===================================================================
--- packages/python-dns/trunk/debian/compat	2013-08-06 21:57:51 UTC (rev 25416)
+++ packages/python-dns/trunk/debian/compat	2013-08-07 03:25:57 UTC (rev 25417)
@@ -1 +1 @@
-7
+8

Modified: packages/python-dns/trunk/debian/control
===================================================================
--- packages/python-dns/trunk/debian/control	2013-08-06 21:57:51 UTC (rev 25416)
+++ packages/python-dns/trunk/debian/control	2013-08-07 03:25:57 UTC (rev 25417)
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Scott Kitterman <scott at kitterman.com>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.3.16), python-all (>= 2.6.5-2~), quilt (>= 0.46-7)
+Build-Depends: debhelper (>= 8.1), python-all (>= 2.6.5-2~), quilt (>= 0.46-7)
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-dns/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-dns/trunk/
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Homepage: http://sourceforge.net/projects/pydns/
 X-Python-Version: >= 2.4
 

Added: packages/python-dns/trunk/debian/patches/pydns_timeout.patch
===================================================================
--- packages/python-dns/trunk/debian/patches/pydns_timeout.patch	                        (rev 0)
+++ packages/python-dns/trunk/debian/patches/pydns_timeout.patch	2013-08-07 03:25:57 UTC (rev 25417)
@@ -0,0 +1,30 @@
+Sent upstream Aug 8, 2013
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718547
+Index: python-dns-2.3.6/DNS/Base.py
+===================================================================
+--- python-dns-2.3.6.orig/DNS/Base.py	2013-08-06 22:58:40.830642636 -0400
++++ python-dns-2.3.6/DNS/Base.py	2013-08-06 22:59:20.570641461 -0400
+@@ -276,6 +276,11 @@
+                 # servers worked:
+                 first_socket_error = first_socket_error or e
+                 continue
++            except TimeoutError, t:
++                first_socket_error = first_socket_error or t
++                continue
++            if self.response:
++                break
+         if not self.response and first_socket_error:
+             raise first_socket_error
+ 
+@@ -313,6 +318,11 @@
+             except socket.error, e:
+                 first_socket_error = first_socket_error or e
+                 continue
++            except TimeoutError, t:
++                first_socket_error = first_socket_error or t
++                continue
++            if self.response:
++                break
+         if not self.response and first_socket_error:
+             raise first_socket_error
+ 

Modified: packages/python-dns/trunk/debian/patches/series
===================================================================
--- packages/python-dns/trunk/debian/patches/series	2013-08-06 21:57:51 UTC (rev 25416)
+++ packages/python-dns/trunk/debian/patches/series	2013-08-07 03:25:57 UTC (rev 25417)
@@ -1 +1,2 @@
+pydns_timeout.patch
 examples-interpreter.diff