diff options
| -rwxr-xr-x | gsettings/gsettings-schema-convert | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gsettings/gsettings-schema-convert b/gsettings/gsettings-schema-convert index 05c69025..36a7e7d8 100755 --- a/gsettings/gsettings-schema-convert +++ b/gsettings/gsettings-schema-convert @@ -746,9 +746,17 @@ class XMLSchemaParser: def map_gconf_type_to_variant_type(gconftype, gconfsubtype): typemap = { 'string': 's', 'int': 'i', 'float': 'd', 'bool': 'b', 'list': 'a' } - result = typemap[gconftype] + try: + result = typemap[gconftype] + except KeyError: + raise GSettingsSchemaConvertException('Type \'%s\' is not a known gconf type.' % gconftype) + if gconftype == 'list': - result = result + typemap[gconfsubtype] + try: + result = result + typemap[gconfsubtype] + except KeyError: + raise GSettingsSchemaConvertException('Type \'%s\' is not a known gconf type.' % gconfsubtype) + return result |