[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, gismo-debian-quilt, updated. debian/0.2.0-git20080909-4-8-gf120d5a

[Luca Capello]

The following commit has been merged in the gismo-debian-quilt branch:
commit f120d5a6e90ce24cd51b984aa31d6ca7153bb828
Author: Luca Capello <luca at pca.it>
Date:   Sun Oct 5 21:33:08 2008 +0200

    debian/patches/03_print-ntype-error-in-const.py.patch: new file
    
    This patch is based on 723b74a5db0a0ea6393c7a7b26f7dffa673f1121,
    later updated by the following commits:
      e9f68595d9cc6fc27809e121746597b1b13c3695
      472823a3a19e62a5d58bb05dcd720f76f267ab0a

diff --git a/debian/changelog b/debian/changelog
index c79c26e..34312db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ fso-frameworkd (0.2.0-git20080909-5) UNRELEASED; urgency=low
   * debian/patches/series: new file.
   * debian/patches/01_adjust-etc-path-in-setup.py.patch: new file.
   * debian/patches/02_ascii-encode-in-gsm-channel.py.patch: new file.
+  * debian/patches/03_print-ntype-error-in-const.py.patch: new file.
   * debian/frameworkd.conf: new file.
   * debian/fso-frameworkd.install:
     + install debian/frameworkd.conf in /etc.
diff --git a/debian/patches/03_print-ntype-error-in-const.py.patch b/debian/patches/03_print-ntype-error-in-const.py.patch
new file mode 100644
index 0000000..289fa19
--- /dev/null
+++ b/debian/patches/03_print-ntype-error-in-const.py.patch
@@ -0,0 +1,23 @@
+--- fso-frameworkd.orig/framework/subsystems/ogsmd/gsm/const.py
++++ fso-frameworkd/framework/subsystems/ogsmd/gsm/const.py
+@@ -13,7 +13,7 @@
+ GSM constants, strings, formats, parse patterns, timeouts, you name it.
+ """
+ 
+-import re
++import re, sys
+ from ogsmd.helpers import BiDict
+ 
+ import logging
+@@ -995,7 +995,10 @@
+     """
+ 
+     # FIXME figure out how to decode ntype 208
+-    assert ntype in ( 129, 145, 185, 208 ), "unknown type %i" % ntype
++    if not ntype in ( 129, 145, 185, 208 ):
++	# No logger available in this module, so I’m being lazy, this
++	# is just a workaround anyways.
++	print >>sys.stderr, "Unknown number type %i when reading number \"%s\"" % (ntype, nstring)
+     if ntype == 145: # should not include '+', but sometimes it does
+         if nstring[0] == '+':
+             return nstring
diff --git a/debian/patches/series b/debian/patches/series
index aeeb26f..16aac09 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_adjust-etc-path-in-setup.py.patch
 02_ascii-encode-in-gsm-channel.py.patch
+03_print-ntype-error-in-const.py.patch

-- 
FSO frameworkd Debian packaging