Merge lp:~brian-murray/update-manager/apport-hook into lp:update-manager

[Brian Murray]

[lp:~brian-murray/update-manager/apport-hook]

2124. By Brian Murray on 2011-06-03

really add apport hook

=== modified file 'DistUpgrade/DistUpgradeApport.py'
--- DistUpgrade/DistUpgradeApport.py	2011-04-28 14:59:41 +0000
+++ DistUpgrade/DistUpgradeApport.py	2011-06-03 18:28:29 +0000
@@ -21,6 +21,7 @@
     # now add the files in /var/log/dist-upgrade/*
     if os.path.exists('/var/crash/_usr_bin_update-manager.0.crash'):
         report = Report()
+        report['Tags'] = 'dist-upgrade'
         for fname in os.listdir("/var/log/dist-upgrade/"):
             f = os.path.join("/var/log/dist-upgrade",fname)
             if not os.path.isfile(f) or os.path.getsize(f) == 0:
 
=== modified file 'DistUpgrade/DistUpgradeCache.py'
--- DistUpgrade/DistUpgradeCache.py	2011-05-02 12:24:48 +0000
+++ DistUpgrade/DistUpgradeCache.py	2011-06-03 18:28:29 +0000
@@ -647,10 +647,9 @@
                 details += _("This is most likely a transient problem, "
                              "please try again later.")
             else:
-                details += _("If none of this applies, then please report this bug against "
-                             "the 'update-manager' package and include the files in "
-                             "/var/log/dist-upgrade/ in the bug report.")
-            # make the error text available again on stdout for the 
+                details += _("If none of this applies, then please report this bug using "
+                             "the command 'ubuntu-bug update-manager' in a terminal."
+            # make the error text available again on stdout for the
             # text frontend
             self._stopAptResolverLog()
             view.error(_("Could not calculate the upgrade"), details)
@@ -860,7 +859,9 @@
                         view.error(_("Can't install '%s'") % key,
                                    _("It was impossible to install a "
                                      "required package. Please report "
-                                     "this as a bug. "))
+                                     "this as a bug using "
+                                     "'ubuntu-bug update-manager' in "
+                                     "a terminal."))
                         return False
                     logging.debug("marked_install: '%s' -> '%s'" % (key, self[key].marked_install))
                     break
 
=== modified file 'DistUpgrade/DistUpgradeController.py'
--- DistUpgrade/DistUpgradeController.py	2011-05-02 12:08:00 +0000
+++ DistUpgrade/DistUpgradeController.py	2011-06-03 18:28:29 +0000
@@ -718,7 +718,9 @@
             self._view.error(_("Repository information invalid"),
                              _("Upgrading the repository information "
                                "resulted in a invalid file. Please "
-                               "report this as a bug."))
+                               "report this as a bug using the command "
+                               "'ubuntu-bug update-manager' in a "
+                               "terminal."))
             return False
 
         if self.sources_disabled:
@@ -1037,8 +1039,9 @@
                         "will run now (dpkg --configure -a).")
                 if not self._partialUpgrade:
                     if not run_apport():
-                        msg += _("\n\nPlease report this bug against the 'update-manager' "
-                                 "package and include the files in /var/log/dist-upgrade/ "
+                        msg += _("\n\nPlease report this bug using the command "
+                                 "'ubuntu-bug update-manager' in a terminal and "
+                                 "include the files in /var/log/dist-upgrade/ "
                                  "in the bug report.\n"
                                  "%s" % e)
                 self._view.error(_("Could not install the upgrades"), msg)
@@ -1497,11 +1500,11 @@
             logging.error("self.prepared() failed")
             self._view.error(_("Preparing the upgrade failed"),
                              _("Preparing the system for the upgrade "
-                               "failed. Please report this as a bug "
-                               "against the 'update-manager' "
-                               "package and include the files in "
-                               "/var/log/dist-upgrade/ "
-                               "in the bug report." ))
+                               "failed. Please report this using the "
+                               "command 'ubuntu-bug update-manager' "
+                               "in a terminal and include the files "
+                               "in /var/log/dist-upgrade/ "
+                               "in the bug report."))
             sys.exit(1)
 
         # mvo: commented out for now, see #54234, this needs to be
@@ -1519,10 +1522,11 @@
                                    "the original system state.\n"
                                    "\n"
                                    "Please report this as a bug "
-                                   "against the 'update-manager' "
-                                   "package and include the files in "
+                                   "using the command "
+                                   "'ubuntu-bug update-manager' in a "
+                                   "terminal and include the files in "
                                    "/var/log/dist-upgrade/ "
-                                   "in the bug report." ))
+                                   "in the bug report."))
                 self.abort()
 
         # run a "apt-get update" now, its ok to ignore errors, 
@@ -1584,8 +1588,9 @@
                                    "updated the essential package '%s' can "
                                    "not be found anymore.\n"
                                    "This indicates a serious error, please "
-                                   "report this bug against the 'update-manager' "
-                                   "package and include the files in /var/log/dist-upgrade/ "
+                                   "report this bug using the command "
+                                   "'ubuntu-bug update-manager' in a terminal "
+                                   "and include the files in /var/log/dist-upgrade/ "
                                    "in the bug report.") % pkg)
                 self.abort()
 
 
=== modified file 'UpdateManager/Core/DistUpgradeFetcherCore.py'
--- UpdateManager/Core/DistUpgradeFetcherCore.py	2011-05-27 08:33:07 +0000
+++ UpdateManager/Core/DistUpgradeFetcherCore.py	2011-06-03 18:28:29 +0000
@@ -134,7 +134,7 @@
         if not os.path.exists(script):
             return self.error(_("Could not run the upgrade tool"),
                          _("Could not run the upgrade tool") + ".  " + _("This is most likely a bug in the upgrade tool. "
-                          "Please report it as a bug"))
+                          "Please report it as a bug using the command 'ubuntu-bug update-manager'."))
         return True
 
     def mirror_from_sources_list(self, uri, default_uri):
@@ -278,7 +278,7 @@
         except OSError, e:
           if e.errno == 13:
             self.error(_("Can not run the upgrade"),
-                       _("This usually is caused by a system were /tmp "
+                       _("This usually is caused by a system where /tmp "
                          "is mounted noexec. Please remount without "
                          "noexec and run the upgrade again."))
             return False
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-05-27 08:29:28 +0000
+++ debian/changelog	2011-06-03 18:28:29 +0000
@@ -13,6 +13,8 @@
   [ Brian Murray ]
   * do-release-upgrade: display version of the new release available not the
     code name
+  * add an apport hook for update-manager and modify bug reporting
+    instructions to recommend using apport (LP: #721382)
 
  -- Michael Vogt <[e-mail]>  Thu, 19 May 2011 09:51:39 +0200
 
 
=== added file 'debian/source_update-manager.py'
--- debian/source_update-manager.py	1970-01-01 00:00:00 +0000
+++ debian/source_update-manager.py	2011-06-03 18:28:29 +0000
@@ -0,0 +1,22 @@
+'''apport package hook for update-manager
+
+(c) 2011 Canonical Ltd.
+Author: Brian Murray <[e-mail]>
+'''
+
+from apport.hookutils import *
+
+
+def add_info(report):
+
+    # collect gconf settings for update-manager
+    report['GconfUpdateManager'] = command_output(['gconftool-2', '-R',
+        '/apps/update-manager'])
+    # grab the non-default values too as it is easier to compare with both the
+    # settings and the non-default values
+    attach_gconf(report, 'update-manager')
+    attach_file_if_exists(report, '/var/log/apt/history.log',
+        'DpkgHistoryLog.txt')
+    attach_root_command_outputs(report,
+        {'DpkgTerminalLog.txt': 'cat /var/log/apt/term.log',
+         'CurrentDmesg.txt': 'dmesg | comm -13 --nocheck-order /var/log/dmesg -'})
 
=== modified file 'debian/update-manager-core.install'
--- debian/update-manager-core.install	2010-04-13 13:43:00 +0000
+++ debian/update-manager-core.install	2011-06-03 18:28:29 +0000
@@ -11,3 +11,4 @@
 debian/tmp/usr/share/computerjanitor
 debian/release-upgrade-motd usr/lib/update-manager
 debian/91-release-upgrade etc/update-motd.d/
+debian/source_update-manager.py /usr/share/apport/package-hooks/