apport-hackers team mailing list archive

[Sebastien Bacher <seb128@xxxxxxxxxx>]

Sebastien Bacher has proposed merging lp:~seb128/apport/relocatable-gsettings-schemas into lp:apport.

Commit message:
don't replace the schema variable in attach_gsettings_schema,
that creates issues with relocatable schemas

Requested reviews:
  Apport upstream developers (apport-hackers)

For more details, see:
https://code.launchpad.net/~seb128/apport/relocatable-gsettings-schemas/+merge/278825

don't replace the schema variable in attach_gsettings_schema,
that creates issues with relocatable schemas

I'm hitting the issue with compiz trying to use
attach_gsettings_schema(report, 'org.compiz.core:/org/compiz/profiles/unity/plugins/core/')

the gsettings command doesn't list the relocating part so schema is changing to 'org.compiz.core' mid-way and the second command hits an error
-- 
Your team Apport upstream developers is requested to review the proposed merge of lp:~seb128/apport/relocatable-gsettings-schemas into lp:apport.

=== modified file 'apport/hookutils.py'
--- apport/hookutils.py	2015-08-10 09:04:59 +0000
+++ apport/hookutils.py	2015-11-27 14:33:16 +0000
@@ -609,23 +609,23 @@
                                  env=env, stdout=subprocess.PIPE)
     for l in gsettings.stdout:
         try:
-            (schema, key, value) = l.split(None, 2)
+            (schema_name, key, value) = l.split(None, 2)
             value = value.rstrip()
         except ValueError:
             continue  # invalid line
-        defaults.setdefault(schema, {})[key] = value
+        defaults.setdefault(schema_name, {})[key] = value
 
     gsettings = subprocess.Popen(['gsettings', 'list-recursively', schema],
                                  stdout=subprocess.PIPE)
     for l in gsettings.stdout:
         try:
-            (schema, key, value) = l.split(None, 2)
+            (schema_name, key, value) = l.split(None, 2)
             value = value.rstrip()
         except ValueError:
             continue  # invalid line
 
-        if value != defaults.get(schema, {}).get(key, ''):
-            cur_value += '%s %s %s\n' % (schema, key, value)
+        if value != defaults.get(schema_name, {}).get(key, ''):
+            cur_value += '%s %s %s\n' % (schema_name, key, value)
 
     report['GsettingsChanges'] = cur_value