Merge lp:~azzar1/ubuntu-release-upgrader/fix-1799310 into lp:ubuntu-release-upgrader

[Andrea Azzarone]

Ask for confirmation if Livepatch is turned on, and you are upgrading to a version where Livepatch is not available.

[Sebastien Bacher (seb128)]

Thanks for your work, one question. The design image on https://wiki.ubuntu.com/ReleaseUpgrades has a settings button on the bottom left corner, is that omitted on purpose in the implementation? (if so maybe add a comment stating why?)

review: Needs Information

[Andrea Azzarone (azzar1)]

> Thanks for your work, one question. The design image on
> https://wiki.ubuntu.com/ReleaseUpgrades has a settings button on the bottom
> left corner, is that omitted on purpose in the implementation? (if so maybe
> add a comment stating why?)

The main reasons are:
- atm there is no way to ask software-properties-gtk to open the livepatch tab. We can open tab by numbers and not by name. Considering that we're moving around tabs, using the number is not a good solution.
- I want to keep the diff as small as possible. In particualar I had to add a mechanism to show that button only under Gtk3. Considering the controller/view model of ubuntu-release-upgrader it's not naive as it seems.

Considering these mpt agreed to not show the button for the moment.

[Sebastien Bacher (seb128)]

(thanks for the reply, also I was just having a look but would prefer if someone from foundations could review/upload so don't bail out just because I commented ;-)

[Brian Murray (brian-murray)]

I'll test this out today.

[Brian Murray (brian-murray)]

It's not a blocker for me per se but I thought it worth mentioning that some things don't match what is in the design. The dialog does not morph and the "turn off" dialog does not have the title bar label indicated in the design. Let me know if you want to get this changed or not. If you don't I'll merge it and upload it to the devel release.

=== modified file 'DistUpgrade/DistUpgradeController.py'
--- DistUpgrade/DistUpgradeController.py	2018-12-11 00:28:15 +0000
+++ DistUpgrade/DistUpgradeController.py	2019-01-17 14:54:46 +0000
@@ -22,6 +22,7 @@
 
 import apt
 import apt_pkg
+import distro_info
 import sys
 import os
 import subprocess
@@ -1151,6 +1152,23 @@
                                         self.cache.required_download)
         return res
 
+    def _isLivepatchEnabled(self):
+        return os.path.isfile('/var/snap/canonical-livepatch/common/machine-token')
+
+    def askLivepatch(self):
+        di = distro_info.UbuntuDistroInfo()
+
+        if not self._isLivepatchEnabled() or di.is_lts(self.toDist):
+            return True
+
+        version = next((r.version for r in di.get_all("object") if r.series == self.toDist), self.toDist)
+
+        res = self._view.askCancelContinueQuestion(None,
+            _("Livepatch security updates are not available for Ubuntu %s. "
+              "If you upgrade, Livepatch will turn off.") % version)
+        return res
+
+
     def _disableAptCronJob(self):
         if os.path.exists("/etc/cron.daily/apt"):
             #self._aptCronJobPerms = os.stat("/etc/cron.daily/apt")[ST_MODE]
@@ -1874,6 +1892,9 @@
                                   "autocreated")
                 self.abort()
 
+        if not self.askLivepatch():
+            self.abort()
+
         # run a "apt-get update" now, its ok to ignore errors, 
         # because 
         # a) we disable any third party sources later

=== modified file 'DistUpgrade/DistUpgradeView.py'
--- DistUpgrade/DistUpgradeView.py	2018-05-04 13:52:53 +0000
+++ DistUpgrade/DistUpgradeView.py	2019-01-17 14:54:46 +0000
@@ -417,6 +417,9 @@
     def askYesNoQuestion(self, summary, msg, default='No'):
         " ask a Yes/No question and return True on 'Yes' "
         pass
+    def askCancelContinueQuestion(self, summary, msg, default='Cancel'):
+        " ask a Cancel/Continue question and return True on 'Continue'"
+        pass
     def confirmRestart(self):
         " generic ask about the restart, can be overridden "
         summary = _("Reboot required")

=== modified file 'DistUpgrade/DistUpgradeViewGtk3.py'
--- DistUpgrade/DistUpgradeViewGtk3.py	2018-08-01 22:04:28 +0000
+++ DistUpgrade/DistUpgradeViewGtk3.py	2019-01-17 14:54:46 +0000
@@ -756,6 +756,30 @@
             return True
         return False
 
+    def askCancelContinueQuestion(self, summary, msg, default='Cancel'):
+        if summary:
+            msg = "<big><b>%s</b></big>\n\n%s" % (summary,msg)
+
+        dialog = Gtk.MessageDialog(parent=self.window_main,
+                                   flags=Gtk.DialogFlags.MODAL,
+                                   type=Gtk.MessageType.WARNING,
+                                   buttons=Gtk.ButtonsType.NONE)
+        dialog.set_title("")
+        dialog.set_markup(msg)
+        dialog.add_buttons(_('Cancel'), Gtk.ResponseType.CANCEL,
+                           _('Continue'), Gtk.ResponseType.ACCEPT)
+
+        if default == 'Cancel':
+            dialog.set_default_response(Gtk.ResponseType.CANCEL)
+        else:
+            dialog.set_default_response(Gtk.ResponseType.ACCEPT)
+
+        res = dialog.run()
+        dialog.destroy()
+        if res == Gtk.ResponseType.ACCEPT:
+            return True
+        return False
+
     def confirmRestart(self):
         self.dialog_restart.set_transient_for(self.window_main)
         self.dialog_restart.set_title("")

=== modified file 'DistUpgrade/DistUpgradeViewKDE.py'
--- DistUpgrade/DistUpgradeViewKDE.py	2018-08-29 12:03:28 +0000
+++ DistUpgrade/DistUpgradeViewKDE.py	2019-01-17 14:54:46 +0000
@@ -929,6 +929,26 @@
             return True
         return False
 
+    def askCancelContinueQuestion(self, summary, msg, default='Cancel'):
+        messageBox = QMessageBox(QMessageBox.Warning, summary, msg, QMessageBox.NoButton, self.window_main)
+        continueButton = messageBox.addButton(QMessageBox.Apply)
+        cancelButton = messageBox.addButton(QMessageBox.Cancel)
+        continueButton.setText(_("Continue"))
+
+        if default == 'Cancel':
+            messageBox.setDefaultButton(cancelButton)
+        else:
+            messageBox.setDefaultButton(continueButton)
+
+        if summary is None:
+            flags = messageBox.windowFlags()
+            messageBox.setWindowFlags(flags | Qt.FramelessWindowHint)
+
+        answer = messageBox.exec_()
+        if answer == QMessageBox.Apply:
+            return True
+        return False
+
     def confirmRestart(self):
         messageBox = QMessageBox(QMessageBox.Question, _("Restart required"), _("<b><big>Restart the system to complete the upgrade</big></b>"), QMessageBox.NoButton, self.window_main)
         yesButton = messageBox.addButton(QMessageBox.Yes)

=== modified file 'DistUpgrade/DistUpgradeViewNonInteractive.py'
--- DistUpgrade/DistUpgradeViewNonInteractive.py	2018-05-04 13:52:53 +0000
+++ DistUpgrade/DistUpgradeViewNonInteractive.py	2019-01-17 14:54:46 +0000
@@ -305,6 +305,8 @@
         #if default.lower() == "no":
         #    return False
         return True
+    def askCancelContinueQuestion(self, summary, msg, default='Cancel'):
+        return True
     def confirmRestart(self):
         " generic ask about the restart, can be overridden "
         logging.debug("confirmRestart() called")

=== modified file 'DistUpgrade/DistUpgradeViewText.py'
--- DistUpgrade/DistUpgradeViewText.py	2018-05-04 13:52:53 +0000
+++ DistUpgrade/DistUpgradeViewText.py	2019-01-17 14:54:46 +0000
@@ -254,7 +254,8 @@
 
     def askYesNoQuestion(self, summary, msg, default='No'):
       print()
-      print(twrap(summary))
+      if summary:
+        print(twrap(summary))
       print(twrap(msg))
       if default == 'No':
           print(_("Continue [yN] "), end="")
@@ -271,6 +272,10 @@
               return False
           return True
 
+    def askCancelContinueQuestion(self, summary, msg, default='Cancel'):
+      return self.askYesNoQuestion(summary, msg,
+        default='No' if default == 'Cancel' else 'Yes')
+
 # FIXME: when we need this most the resolver is writing debug logs
 #        and we redirect stdout/stderr    
 #    def processEvents(self):

=== modified file 'debian/changelog'
--- debian/changelog	2018-12-21 18:21:10 +0000
+++ debian/changelog	2019-01-17 14:54:46 +0000
@@ -1,3 +1,19 @@
+ubuntu-release-upgrader (1:19.04.9) UNRELEASED; urgency=medium
+
+  * DistUpgrade/DistUpgradeView.py,
+    DistUpgrade/DistUpgradeViewGtk3.py,
+    DistUpgrade/DistUpgradeViewKDE.py,
+    DistUpgrade/DistUpgradeViewNonInteractive.py,
+    DistUpgrade/DistUpgradeViewText.py:
+    - add askCancelContinueQuestion for all the supported views.
+  * DistUpgrade/DistUpgradeController.py: Ask for confirmation if Livepatch
+    is turned on, and you are upgrading to a version where Livepatch is not
+    available. (LP: #1799310)
+  * debian/control: add an explicit python3-distro-info dependency to
+    python3-distupgrade as it is now required by DistUpgradeController.
+
+ -- Andrea Azzarone <[e-mail]>  Thu, 17 Jan 2019 04:16:29 -0800
+
 ubuntu-release-upgrader (1:19.04.9) disco; urgency=medium
 
   * DistUpgrade/xorg_fix_proprietary.py: shebang needs to use python3 not

=== modified file 'debian/control'
--- debian/control	2018-11-28 18:02:37 +0000
+++ debian/control	2019-01-17 14:54:46 +0000
@@ -40,6 +40,7 @@
          ${misc:Depends},
          python3-update-manager (>= 1:19.04.2~),
          python3-apt (>= 0.8.5~),
+         python3-distro-info,
          gpgv,
          lsb-release,
          sensible-utils