diff --git a/.gitignore b/.gitignore index d1698db2..15c3c48c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ debian/.debhelper debian/files debian/mintupdate.debhelper.log debian/mintupdate.substvars +mintupdate-window.png +__pycache__/ diff --git a/usr/lib/linuxmint/mintUpdate/mintUpdate.py b/usr/lib/linuxmint/mintUpdate/mintUpdate.py index 56a2400c..0851d0a0 100755 --- a/usr/lib/linuxmint/mintUpdate/mintUpdate.py +++ b/usr/lib/linuxmint/mintUpdate/mintUpdate.py @@ -2139,10 +2139,10 @@ def refresh_updates(self): ############## INSTALLATION ######### - def show_cinnamon_error(self, title, message): - Gdk.threads_add_idle(GLib.PRIORITY_DEFAULT_IDLE, self._show_cinnamon_error_cb, title, message) + def show_install_error(self, title, message): + Gdk.threads_add_idle(GLib.PRIORITY_DEFAULT_IDLE, self._show_install_error_cb, title, message) - def _show_cinnamon_error_cb(self, title, message): + def _show_install_error_cb(self, title, message): dialog = Gtk.MessageDialog(transient_for=self.ui_window, destroy_with_parent=True, modal=True, @@ -2261,6 +2261,11 @@ def _do_install(self): self.flatpak_updater.perform_updates() if self.flatpak_updater.error is not None: self.logger.write_error("Flatpak update failed %s" % self.flatpak_updater.error) + self.show_install_error(_("Could not update Flatpaks"), + str(self.flatpak_updater.error)) + self.set_status(_("Could not update Flatpaks"), + _("Could not update Flatpaks"), + "mintupdate-error-symbolic", True) refresh_needed = True if self.spices: @@ -2277,7 +2282,7 @@ def _do_install(self): need_cinnamon_restart = True except Exception as e: self.logger.write_error("Cinnamon spice install failed %s" % str(e)) - self.show_cinnamon_error(_("Could not update Cinnamon Spices"), str(e)) + self.show_install_error(_("Could not update Cinnamon Spices"), str(e)) if need_cinnamon_restart and not self.reboot_required and \ os.getenv("XDG_CURRENT_DESKTOP") in ["Cinnamon", "X-Cinnamon"]: subprocess.run(["cinnamon-dbus-command", "RestartCinnamon", "0"])