Merge lp:~seb128/unity/update-apport-hook into lp:unity

[Sebastien Bacher]

Updated apport hook to include:
- the compiz and xorg details, not only after asking users if the issue
is a graphical one (which is weird question)
- the upstart logs for unity/ups/lockscreen
- some gsettings configurations

Updated apport hook to include:
- the compiz and xorg details, not only after asking users if the issue
is a graphical one (which is weird question)
- the upstart logs for unity/ups/lockscreen
- some gsettings configurations

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4037
http://jenkins.qa.ubuntu.com/job/unity-ci/1362/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/14/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1362/rebuild

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

+1

It would be nice to move the data out from libunity-core-6.0-9 though.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4037
http://jenkins.qa.ubuntu.com/job/unity-ci/1363/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/15/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1363/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4037
http://jenkins.qa.ubuntu.com/job/unity-ci/1364/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/16

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1364/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/source_unity.py'
--- debian/source_unity.py	2012-07-02 13:02:47 +0000
+++ debian/source_unity.py	2015-11-27 09:41:58 +0000
@@ -21,18 +21,13 @@
                 report.add_package_info(apport.packaging.get_file_package(words))
                 return
 
-    # only reports all compiz infos if a graphical bug
-    compiz_bug = False
-    if ui and report['SourcePackage'] == "unity":
-        if ui.yesno("Thanks for reporting this bug on unity.  Is the issue you are reporting purely graphical (will report more information about your graphic configuration and will report the bug against compiz)?"):
-            compiz_bug = True
-    if compiz_bug:
-        report.add_hooks_info(ui, srcpackage='compiz')
-    else:
-        # still send some info like the plugins activated
-        # Plugins
-        report['CompizPlugins'] = command_output(['gconftool-2',
-            '--get', '/apps/compiz-1/general/screen0/options/active_plugins'])
-
-        # User configuration
-        report['GconfCompiz'] = command_output(['gconftool-2', '-R', '/apps/compiz-1'])
+    # Include the compiz details
+    report.add_hooks_info(ui, srcpackage='compiz')
+    # the upstart logs
+    attach_upstart_logs(report, 'unity-services')
+    attach_upstart_logs(report ,'libunity-core-6.0-9')
+    # some gsettings configs
+    attach_gsettings_schema(report, 'com.canonical.Unity')
+    attach_gsettings_schema(report, 'com.ubuntu.user-interface')
+    attach_gsettings_schema(report, 'org.gnome.desktop.interface')
+    attach_gsettings_schema(report, 'org.gnome.desktop.lockdown')