[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819

[Sebastian Krzyszkowiak]

The following commit has been merged in the debian branch:
commit d48bd43c430322b26744e31829f9c76e9b725819
Author: Tom Hacohen <tom at stosb.com>
Date:   Tue Oct 20 15:14:48 2009 +0200

    opimd: Numbers are sometimes sent as 'unicode', changed the checks to conform to that.
    This solves the numbers not resolving issue. There's probably a bug somewhere else, though in the meanwhile this solves the issue.
    
    Signed-off-by: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>

diff --git a/framework/subsystems/opimd/pimd_generic.py b/framework/subsystems/opimd/pimd_generic.py
index 04fd0cd..ab208f4 100644
--- a/framework/subsystems/opimd/pimd_generic.py
+++ b/framework/subsystems/opimd/pimd_generic.py
@@ -138,10 +138,10 @@ class GenericEntry():
     def make_comp_value(self, field_value):
         # We only generate compare values for specific fields
         try:
-            if isinstance(field_value, (str, dbus.String)) and field_value.startswith('tel:'):
+            if isinstance(field_value, (str, unicode, dbus.String)) and field_value.startswith('tel:'):
                 return get_compare_for_tel(field_value)
-        except:
-            pass
+        except Exception as exp:
+            logger.error(str(exp))
         return ''
 
     def import_fields(self, entry_data, backend_name):

-- 
FSO frameworkd Debian packaging