Merge lp:~brian-murray/update-manager/bug-1826213 into lp:update-manager

[Brian Murray]

=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2020-04-08 15:56:20 +0000
+++ UpdateManager/UpdateManager.py	2020-05-27 20:25:14 +0000
@@ -235,6 +235,9 @@
         self._look_busy()
         self.refresh_cache()
 
+        if self.cache is None:
+            return
+
         pane = self._make_available_pane(self.cache.install_count
                                          + self.cache.del_count,
                                          os.path.exists(REBOOT_REQUIRED_FILE),
@@ -376,7 +379,8 @@
                      "Please use the package manager \"Synaptic\" or run "
                      "\"sudo apt-get install -f\" in a terminal to fix "
                      "this issue at first.")
-            self.start_error(True, header, desc)
+            self.start_error(False, header, desc)
+            return
         except SystemError as e:
             header = _("Could not initialize the package information")
             desc = _("An unresolvable problem occurred while "
@@ -384,7 +388,8 @@
                      "Please report this bug against the 'update-manager' "
                      "package and include the following error "
                      "message:\n") + str(e)
-            self.start_error(True, header, desc)
+            self.start_error(False, header, desc)
+            return
 
         # Let the Gtk event loop breath if it hasn't had a chance.
         def iterate():
 
=== modified file 'debian/changelog'
--- debian/changelog	2020-04-23 17:47:54 +0000
+++ debian/changelog	2020-05-27 20:25:14 +0000
@@ -1,3 +1,12 @@
+update-manager (1:20.04.11) UNRELEASED; urgency=medium
+
+  * UpdateManager/UpdateManager.py: when refreshing the cache and encountering
+    an error return rather than trying to use the undefined cache which causes
+    crashes. Additionally, don't present the dialog with a "Try Again" button
+    which won't do anything. (LP: #1826213)
+
+ -- Brian Murray <[e-mail]>  Wed, 27 May 2020 11:45:53 -0700
+
 update-manager (1:20.04.10) focal; urgency=medium
 
   * Fix intermittent hang during snap updates (LP: #1874469).