Merge lp:~jibel/ubuntu/trusty/ubuntu-release-upgrader/dont_fail_if_no_apport into lp:ubuntu/trusty/ubuntu-release-upgrader

[Jean-Baptiste Lallement]

* DistUpgrade/DistUpgradeController.py: Catch exception if apport is not installed and fail gracefully (LP:#1285545)

[Brian Murray (brian-murray)]

Thanks for working on this, I think instead of logging the error regarding apport-bug failing we should instead change the error message (e.g. lines 819-822) to not mention that a bug reporting process will be started and instead tell them how to report a bug. So something like:

if os.path.exists('/usr/bin/apport-bug'):
   self._view.error(existing message)
   subproces.Popen(bug reporting)
else:
   self._view.error("Install apport to report a bug...")
   logging.error("Could not automatically report a bug")

If that change makes sense do you want to work on it? or shall I?

review: Needs Fixing

[Jean-Baptiste Lallement (jibel)]

Thanks for the review. It makes sense to change it the way you suggest. Feel free to work.

[Jean-Baptiste Lallement (jibel)]

+ on it :)

[Brian Murray (brian-murray)]

revno: 2732
fixes bug: https://launchpad.net/bugs/1285545
committer: Brian Murray <email address hidden>
branch nick: trunk
timestamp: Wed 2014-03-05 10:56:34 -0800
message:
  DistUpgrade/DistUpgradeController.py: Catch exception if apport is not
  installed and fail gracefully. Thanks to Jean-Baptiste Lallement for the
  initial patch. (LP: #1285545)

=== modified file 'DistUpgrade/DistUpgradeController.py'
--- DistUpgrade/DistUpgradeController.py	2014-01-23 16:14:37 +0000
+++ DistUpgrade/DistUpgradeController.py	2014-02-27 08:53:04 +0000
@@ -820,7 +820,12 @@
                              _("Upgrading the repository information "
                                "resulted in a invalid file so a bug "
                                "reporting process is being started."))
-            subprocess.Popen(["apport-bug", "ubuntu-release-upgrader-core"])
+            try:
+                subprocess.Popen(["apport-bug", "ubuntu-release-upgrader-core"])
+            except OSError:
+                logging.error("The command 'apport-bug "
+                              "ubuntu-release-upgrader-core' failed (Is "
+                              "apport installed on your system?)")
             return False
 
         if self.sources_disabled:
@@ -1642,7 +1647,12 @@
                              _("Preparing the system for the upgrade "
                                "failed so a bug reporting process is "
                                "being started."))
-            subprocess.Popen(["apport-bug", "ubuntu-release-upgrader-core"])
+            try:
+                subprocess.Popen(["apport-bug", "ubuntu-release-upgrader-core"])
+            except OSError:
+                logging.error("The command 'apport-bug "
+                              "ubuntu-release-upgrader-core' failed (Is "
+                              "apport installed on your system?)")
             sys.exit(1)
 
         # mvo: commented out for now, see #54234, this needs to be
@@ -1661,7 +1671,12 @@
                                    "\n"
                                    "Additionally, a bug reporting process is "
                                    "being started."))
-                subprocess.Popen(["apport-bug", "ubuntu-release-upgrader-core"])
+                try:
+                    subprocess.Popen(["apport-bug", "ubuntu-release-upgrader-core"])
+                except OSError:
+                    logging.error("The command 'apport-bug "
+                                  "ubuntu-release-upgrader-core' failed (Is "
+                                  "apport installed on your system?)")
                 self.abort()
 
         # run a "apt-get update" now, its ok to ignore errors, 
@@ -1735,7 +1750,12 @@
                                    "In the case of an overloaded mirror, you "
                                    "may want to try the upgrade again later.")
                                    % pkg)
-                subprocess.Popen(["apport-bug", "ubuntu-release-upgrader-core"])
+                try:
+                    subprocess.Popen(["apport-bug", "ubuntu-release-upgrader-core"])
+                except OSError:
+                    logging.error("The command 'apport-bug "
+                                  "ubuntu-release-upgrader-core' failed (Is "
+                                  "apport installed on your system?)")
                 self.abort()
 
         # calc the dist-upgrade and see if the removals are ok/expected