[Python-apps-commits] r11673 - in packages/wader/trunk/debian (5 files)

[stefanor at users.alioth.debian.org]

    Date: Saturday, January 17, 2015 @ 20:08:54
  Author: stefanor
Revision: 11673

* debian/control: add Vcs-* (Closes: #662823)
* Change maintainer to Debian Python Applications Team.
* Add myself to uploaders.
* Fix DB apn.network_id / network_info.id type issues. (Closes: #768756)

Added:
  packages/wader/trunk/debian/patches/
  packages/wader/trunk/debian/patches/fix-network_info.id-type-issues.patch
  packages/wader/trunk/debian/patches/series
Modified:
  packages/wader/trunk/debian/changelog
  packages/wader/trunk/debian/control

Modified: packages/wader/trunk/debian/changelog
===================================================================
--- packages/wader/trunk/debian/changelog	2015-01-13 16:05:54 UTC (rev 11672)
+++ packages/wader/trunk/debian/changelog	2015-01-17 20:08:54 UTC (rev 11673)
@@ -1,16 +1,19 @@
-wader (0.5.12-3) UNRELEASED; urgency=low
+wader (0.5.12-2) unstable; urgency=low
 
+  [ Alex Chiang ]
+  * debian/control: add Vcs-* (Closes: #662823)
+
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
   * Use empty lines to separate paragraphs in debian/control.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 18:49:07 +0200
+  [ Graham Inggs ]
+  * Change maintainer to Debian Python Applications Team.
+  * Add myself to uploaders.
+  * Fix DB apn.network_id / network_info.id type issues. (Closes: #768756)
 
-wader (0.5.12-2) unstable; urgency=low
+ -- Graham Inggs <graham at nerve.org.za>  Sat, 03 Jan 2015 22:38:10 +0200
 
-  * debian/control: add Vcs-* (Closes: #662823)
-
- -- Alex Chiang <achiang at canonical.com>  Mon, 10 Sep 2012 12:19:56 -0700
-
 wader (0.5.12-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/wader/trunk/debian/control
===================================================================
--- packages/wader/trunk/debian/control	2015-01-13 16:05:54 UTC (rev 11672)
+++ packages/wader/trunk/debian/control	2015-01-17 20:08:54 UTC (rev 11673)
@@ -1,5 +1,6 @@
 Source: wader
-Maintainer: Alex Chiang <achiang at canonical.com>
+Maintainer: Debian Python Applications Team <python-apps-team at lists.alioth.debian.org>
+Uploaders: Graham Inggs <graham at nerve.org.za>
 Section: net
 Priority: optional
 Build-Depends: debhelper (>= 7.0.50~),

Added: packages/wader/trunk/debian/patches/fix-network_info.id-type-issues.patch
===================================================================
--- packages/wader/trunk/debian/patches/fix-network_info.id-type-issues.patch	                        (rev 0)
+++ packages/wader/trunk/debian/patches/fix-network_info.id-type-issues.patch	2015-01-17 20:08:54 UTC (rev 11673)
@@ -0,0 +1,50 @@
+Description: Fix DB apn.network_id / network_info.id type issues
+ Previously the DB or its bindings have been been silently fixing or ignoring
+ this for us, but now this is not the case, so do it properly.
+ .
+ This fixes a FTBFS with sqlite3 >= 3.8.7.1.
+Origin: upstream, https://github.com/andrewbird/wader/commit/e8b8ce830869506adc4fc7ccb90fb4552fe94561
+Author: Andrew Bird <ajb at spheresystems.co.uk>
+Bug-Debian: https://bugs.debian.org/768756
+Last-Update: 2014-12-29
+--- a/wader/common/provider.py
++++ b/wader/common/provider.py
+@@ -166,7 +166,7 @@
+ 
+ NETWORKS_SCHEMA = """
+ create table network_info(
+-    id text primary key,
++    id integer primary key,
+     name text,
+     country text);
+ 
+@@ -614,7 +614,14 @@
+         c = self.conn.cursor()
+ 
+         for network in networks:
+-            for netid in network.netid:
++            for snetid in network.netid:
++
++                # DB field is int not string
++                try:
++                    netid = int(snetid)
++                except (ValueError, TypeError):
++                    continue
++
+                 # check if this network object exists in the database
+                 c.execute("select 1 from network_info where id=?", (netid,))
+                 try:
+@@ -706,7 +713,12 @@
+             for networkid in getElementsByTagNameNoDescend(gsm, "network-id"):
+                 mcc = getAttributeValue(networkid, "mcc")
+                 mnc = getAttributeValue(networkid, "mnc")
+-                netid = mcc + mnc
++
++                # DB field is int not string
++                try:
++                    netid = int(mcc + mnc)
++                except (ValueError, TypeError):
++                    continue
+ 
+                 # check if this network object exists in the database
+                 c.execute("select 1 from network_info where id=?", (netid,))

Added: packages/wader/trunk/debian/patches/series
===================================================================
--- packages/wader/trunk/debian/patches/series	                        (rev 0)
+++ packages/wader/trunk/debian/patches/series	2015-01-17 20:08:54 UTC (rev 11673)
@@ -0,0 +1 @@
+fix-network_info.id-type-issues.patch