Merge lp:~mfisch/lightdm/lightdm-various-fixes into lp:~ubuntu-desktop/lightdm/ubuntu

[Matt Fischer]

This review fixes the case where someone does a remove+purge and then attempts to re-install. Previous purges were not completely purging and leaving some odd ownership when done (ownership is also fixed on reinstall)

Apport:

The apport script wasn't in the package so it wasn't too useful, in addition it wasn't collecting the right stuff, nor was it asking for permission since the files need root priveleges and main contain sensitive info. I stole most of this from the source_xorg.py file at Bryce Harrington's suggestion. Tested this and it works well.

Here's a bug it generated (note: in this bug the users.conf was not collected properly):
https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/1067591

=== modified file 'debian/lightdm.install'
--- debian/lightdm.install	2011-09-30 14:49:44 +0000
+++ debian/lightdm.install	2012-11-06 21:18:20 +0000
@@ -1,7 +1,6 @@
 usr/sbin/lightdm
 usr/share/man
 usr/share/locale
-usr/share/man
 usr/lib/lightdm
 usr/bin
 etc/dbus-1/
@@ -12,3 +11,4 @@
 debian/lightdm-session usr/sbin
 debian/guest-account usr/sbin
 debian/lightdm-greeter-session usr/lib/lightdm
+debian/source_lightdm.py usr/share/apport/package-hooks
 
=== modified file 'debian/lightdm.postinst'
--- debian/lightdm.postinst	2012-03-05 12:02:39 +0000
+++ debian/lightdm.postinst	2012-11-06 21:18:20 +0000
@@ -37,7 +37,7 @@
 fi
 
 if [ -d /var/lib/lightdm ]; then
-  chown lightdm:lightdm /var/lib/lightdm
+  chown -R lightdm:lightdm /var/lib/lightdm
   chmod 0750 /var/lib/lightdm
 fi
 
 
=== modified file 'debian/lightdm.postrm'
--- debian/lightdm.postrm	2011-08-09 13:27:33 +0000
+++ debian/lightdm.postrm	2012-11-06 21:18:20 +0000
@@ -28,11 +28,20 @@
                         deluser --system lightdm
                 fi
         fi
+
         if getent group lightdm >/dev/null; then
                 if [ -x /usr/sbin/delgroup ]; then
                         delgroup --system lightdm
                 fi
         fi
+
+        # we cannot use the --remove-home option when we delete the user above
+        # because it will refuse to remove things in /var, so clean it up this
+        # way
+        if [ -d /var/lib/lightdm ]; then
+                rm -r /var/lib/lightdm
+        fi
+
 fi
 #DEBHELPER#
 exit 0
 
=== modified file 'debian/source_lightdm.py'
--- debian/source_lightdm.py	2011-08-09 13:27:33 +0000
+++ debian/source_lightdm.py	2012-11-06 21:18:20 +0000
@@ -1,13 +1,28 @@
 import os
 import re
 
-import apport.packaging
-import apport.hookutils
+from apport.hookutils import *
 
 def add_info(report, ui):
 
-    report["Log"] = apport.hookutils.read_file("/var/log/lightdm/:0.log")
-    report["LightdmLog"] = apport.hookutils.read_file("/var/log/lightdm/lightdm.log")
-    report["GreeterLog"] = apport.hookutils.read_file("/var/log/lightdm/:0-greeter.log")
-    report["XorgLog"] = apport.hookutils.read_file("/var/log/Xorg.0.log")
+    if ui:
+        display_manager_files = {}
+        if os.path.lexists('/var/log/lightdm'):
+            display_manager_files['LightdmLog'] = \
+                'cat /var/log/lightdm/lightdm.log'
+            display_manager_files['LightdmDisplayLog'] = \
+                'cat /var/log/lightdm/x-0.log'
+            display_manager_files['LightdmGreeterLog'] = \
+                 'cat /var/log/lightdm/x-0-greeter.log'
+            display_manager_files['LightdmGreeterLogOld'] = \
+                 'cat /var/log/lightdm/x-0-greeter.log.old'
+            display_manager_files['LightdmConfig'] = \
+                'cat /etc/lightdm/lightdm.conf'
+            display_manager_files['LightdmUsersConfig'] = \
+                'cat /etc/lightdm/users.conf'
 
+        if ui.yesno("Your display manager log files may help developers"\
+                    " diagnose the bug, but may contain sensitive information"\
+                    " such as your hostname or username.  Do you want to"\
+                    " include these logs in your bug report?") == True:
+            attach_root_command_outputs(report, display_manager_files)