Merge lp:~darkxst/gnome-shell/apport-hook-update-lp1058845 into lp:ubuntu/quantal/gnome-shell

[Tim Lunn]

Update apport hooks to
   - Record running Display Manager
   - Collect gnome-shell session logs

[Mathieu Trudel-Lapierre (cyphermox)]

Marking as Merged since this was recently marked as Fix Released in Quantal.

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-26 18:16:43 +0000
+++ debian/changelog	2012-10-02 03:02:19 +0000
@@ -1,3 +1,11 @@
+gnome-shell (3.6.0-0ubuntu3) UNRELEASED; urgency=low
+
+  * debian/source_gnome-shell.py
+    - Update apport hook to log running display manager(LP: 1058845) 
+    - Update apport hook to collect gnome-shell session logs
+
+ -- Tim Lunn <[e-mail]>  Sun, 30 Sep 2012 10:48:36 +1000
+
 gnome-shell (3.6.0-0ubuntu2) quantal; urgency=low
 
   * debian/control.in,gnome-shell-common.install:

=== modified file 'debian/source_gnome-shell.py'
--- debian/source_gnome-shell.py	2012-09-19 11:12:56 +0000
+++ debian/source_gnome-shell.py	2012-10-02 03:02:19 +0000
@@ -1,5 +1,36 @@
 from apport.hookutils import *
+import os
+
+def is_process_running(proc):
+    '''
+    Determine if process has a registered process id
+    '''
+    log = command_output(['pidof', proc])
+    if not log or log[:5] == "Error" or len(log)<1:
+        return False
+    return True
 
 def add_info(report):
-	attach_gsettings_package(report, 'gnome-shell-common')
-	attach_gsettings_schema(report, 'org.gnome.desktop.interface')
+    attach_gsettings_package(report, 'gnome-shell-common')
+    attach_gsettings_schema(report, 'org.gnome.desktop.interface')
+    
+    result = ''
+
+    dm_list = apport.hookutils.command_output(['sh', '-c', 
+	'apt-cache search \"display manager\" | cut -d \' \' -f1 | grep dm$'])
+
+    for line in dm_list.split('\n'):
+        if (is_process_running(line)):
+            result = line
+            break
+
+    report['DisplayManager'] = result
+
+    HOME = os.path.expanduser("~")
+    if result == 'gdm':
+        attach_file_if_exists(report, HOME+'/.cache/gdm/session.log',key='gdmSessionLog')
+    else:   
+        attach_file_if_exists(report, HOME+'/.xsession-errors',key='XsessionLog')
+
+
+