[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#690875: unblock: weboob/0.c-4.1



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Please unblock package weboob

This is an NMU to fix bug #690301 which render makes many use cases of weboob fail.
The change is a small patch cherry-picked from upstream, which works around an
incompatible API change of python-prettytable.

The debdiff also includes a small typo fix which was made by the package
maintainer in his Git repository. I know it should not be here strictly
speaking, so tell me if I should prepare a version without it.

unblock weboob/0.c-4.1

- -- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-3-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBCgAGBQJQgE/pAAoJEOryzVHFAGgZHO0QAJumQyIy7V62O79jQAV7GDnG
ZD2qmZE/RUzocNt8iv7l1is7yxnOm9+jbg1WuKKUfnYgY9E1fN6LRwKwFr/YbyBK
bRz8wF44MG+te+tCDUPVMq6WvaOZrFkCEE3CXaOplVJ4d7PX6P72TJSsv+yZUpC4
QOGRFMst2/pgYdT2a75zVMhOn+toISgvK07eq47nqIHeZqtj1uOHLOOuPA+m2G8Q
5XoBjlgBYRzg80JqMu9BAIKEnUGzGCm3c0U1WznC48OKP8WS+0W9O07WcLLGoARP
S5/Itv1A1+HGVoXgCUNnjzV5z4o2Maa1keUtCq6ZmPr2HIzuJWhhwxc9abEsGZQB
P/tQpF8VJrs2TggqURPEYMHxEiDCougj7MzfHug6NEL7lI5IDOwGW4V+aOye5Kqz
8uSS57Fcxq62/sGOTLWvLCvEs+Ri5a7GzWHb+HLF/lkIU6r40KkRfJKSwmXZwTzX
wO4sgB/k+i1IR3FlEbUq6xA7HDKaCe7ysB9Xks4DBJIzcsxVUiFwJjWIk7E8XqjT
RUnZK0rojMywWcWjCFzdHVKjbYZVw15w+Q15eW18PsPsx8HROAzkR6B/Kx0m0YbN
YTu1uHZdSZTLIgk+O+xgbUyo+F/Kd0NPUALtwWGd5nXQvWbCOKBVy+0+bSmISUq4
fjNiuio2Kvhtx3ChnlFx
=s1rT
-----END PGP SIGNATURE-----
diff -Nru weboob-0.c/debian/changelog weboob-0.c/debian/changelog
--- weboob-0.c/debian/changelog	2012-06-13 11:43:34.000000000 +0200
+++ weboob-0.c/debian/changelog	2012-10-18 20:37:01.000000000 +0200
@@ -1,3 +1,11 @@
+weboob (0.c-4.1) unstable; urgency=low
+
+  * Non-maintainer upload, already approved by the maintainer.
+  * Fix incompatibility with the last version of python-prettytable.
+    (Closes: #690301)
+
+ -- Tanguy Ortolo <tanguy+debian@ortolo.eu>  Thu, 18 Oct 2012 20:25:14 +0200
+
 weboob (0.c-4) unstable; urgency=low
 
   * Add watch file for uscan
@@ -8,8 +16,8 @@
   * Fix typo and whatis entry in manpages
   * Ignore dynamic quilt files
   * Fix call to dh_python2
-  * Bump debhelper compat level to 9 (recommanded version)
-  * Fail when not all files are installed or explicitely ignored
+  * Bump debhelper compat level to 9 (recommended version)
+  * Fail when not all files are installed or explicitly ignored
   * Install bash autocompletion
   * Add weboob-debug to python-weboob-core package
   * Do not install egg file, only meta-data
diff -Nru weboob-0.c/debian/patches/series weboob-0.c/debian/patches/series
--- weboob-0.c/debian/patches/series	2012-06-11 00:02:37.000000000 +0200
+++ weboob-0.c/debian/patches/series	2012-10-18 20:12:03.000000000 +0200
@@ -1,2 +1,3 @@
 for-upstream_fix-manpage-header.patch
 for-upstream_fix-manpage-typos.patch
+workaround-prettytable-api.patch
diff -Nru weboob-0.c/debian/patches/workaround-prettytable-api.patch weboob-0.c/debian/patches/workaround-prettytable-api.patch
--- weboob-0.c/debian/patches/workaround-prettytable-api.patch	1970-01-01 01:00:00.000000000 +0100
+++ weboob-0.c/debian/patches/workaround-prettytable-api.patch	2012-10-18 20:20:41.000000000 +0200
@@ -0,0 +1,30 @@
+From: Florent <weboob@flo.fourcot.fr>
+Origin: upstream, http://git.symlink.me/?p=romain/weboob-stable.git;a=commit;h=a8e2342edcbc38b940089822dafdcebd27b00946
+Bug-Debian: http://bugs.debian.org/690301
+Last-Update: 2012-10-18
+Subject: Fix a frequent crash due to an API change in table formater
+
+This patch works around the incompatible API change in python-prettytable
+reported in bug #673790.
+diff --git a/weboob/tools/application/formatters/table.py b/weboob/tools/application/formatters/table.py
+index d11dc11..55e7468 100644
+--- a/weboob/tools/application/formatters/table.py
++++ b/weboob/tools/application/formatters/table.py
+@@ -69,7 +69,13 @@ class TableFormatter(IFormatter):
+             s += "\n"
+         table = PrettyTable(list(column_headers))
+         for column_header in column_headers:
+-            table.set_field_align(column_header, 'l')
++            # API changed in python-prettytable. The try/except is a bad hack to support both versions
++            # Note: two versions are not exactly the same... 
++            # (first one: header in center. Second one: left align for header too)
++            try:
++                table.set_field_align(column_header, 'l')
++            except:
++                table.align[column_header] = 'l'
+         for line in queue:
+             table.add_row(line)
+ 
+-- 
+1.7.2.5
+

Reply to: