Merge lp:~juliank/ubuntu-release-upgrader/double-check-source-release into lp:ubuntu-release-upgrader

[Julian Andres Klode]

Check that a sources.list entry for the "from" distribution exists
before attempting to upgrade (LP: #1725359)

[lp:~juliank/ubuntu-release-upgrader/double-check-source-release]

3100. By Julian Andres Klode on 2018-02-07

Also check that e.type == "deb" when validating fromDist

3101. By Julian Andres Klode on 2018-02-08

Add test cases for double checking source release

3102. By Julian Andres Klode on 2018-02-08

Fixup test case to correctly mock get_distro

3103. By Julian Andres Klode on 2018-02-08

Actually fix up docstrings for the new tests

[Brian Murray (brian-murray)]

I've added a comment to the bug report regarding fixing this a different way.

=== modified file 'DistUpgrade/DistUpgradeController.py'
--- DistUpgrade/DistUpgradeController.py	2018-01-29 09:43:48 +0000
+++ DistUpgrade/DistUpgradeController.py	2018-02-08 09:25:43 +0000
@@ -771,6 +771,17 @@
     def updateSourcesList(self):
         logging.debug("updateSourcesList()")
         self.sources = SourcesList(matcherPath=self.datadir)
+        
+        if not any(e.type == "deb" and e.dist == self.fromDist for e in self.sources):
+            res = self._view.askYesNoQuestion(_("No valid sources.list entry found"),
+                             _("While scanning your repository "
+                               "information no entry about %s could be "
+                               "found.\n\n"
+                               "An upgrade might not succeed.\n\n"
+                               "Do you want to continue anyway?") % self.fromDist)
+            if not res:
+                self.abort()
+
         # backup first!
         self.sources.backup(self.sources_backup_ext)
         if not self.rewriteSourcesList(mirror_check=True):

=== modified file 'debian/changelog'
--- debian/changelog	2018-02-05 11:26:33 +0000
+++ debian/changelog	2018-02-08 09:25:43 +0000
@@ -1,3 +1,10 @@
+ubuntu-release-upgrader (1:18.04.9) UNRELEASED; urgency=medium
+
+  * Check that a sources.list entry for the "from" distribution exists
+    before attempting to upgrade (LP: #1725359)
+
+ -- Julian Andres Klode <[e-mail]>  Wed, 07 Feb 2018 11:09:03 +0100
+
 ubuntu-release-upgrader (1:18.04.8) bionic; urgency=medium
 
   * data/DistUpgrade.cfg: Add ubuntu-budgie-desktop support.

=== modified file 'tests/test_sources_list.py'
--- tests/test_sources_list.py	2018-01-29 10:59:52 +0000
+++ tests/test_sources_list.py	2018-02-08 09:25:43 +0000
@@ -126,6 +126,81 @@
              apt_pkg.config.find_file("Dir::Etc::sourcelist") + ".in",
              apt_pkg.config.find_file("Dir::Etc::sourcelist") + ".distUpgrade"
              ]))
+             
+    @mock.patch("DistUpgrade.DistUpgradeController.DistUpgradeController.abort")
+    @mock.patch("DistUpgrade.DistUpgradeController.get_distro")
+    def test_double_check_source_distribution_reject(self, mock_abort, mock_get_distro):
+        """
+        test that an upgrade from feisty with a sources.list containing
+        hardy asks a question, and if rejected, aborts the upgrade.
+        """
+        shutil.copy(os.path.join(self.testdir, "sources.list.hardy"),
+                    os.path.join(self.testdir, "sources.list"))
+        apt_pkg.config.set("Dir::Etc::sourcelist", "sources.list")
+        v = mock.Mock()
+        v.askYesNoQuestion.return_value=False
+        d = DistUpgradeController(v, datadir=self.testdir)
+        d.config.set("Distro", "BaseMetaPkgs", "ubuntu-minimal")
+        mock_get_distro.return_value = UbuntuDistribution("Ubuntu", "feisty",
+                                                          "Ubuntu Feisty Fawn",
+                                                          "7.04")
+        
+        class AbortException(Exception):
+            """Exception"""
+                
+        mock_abort.side_effect = AbortException
+        d.openCache(lock=False)
+        with self.assertRaises(AbortException):
+            d.updateSourcesList()
+        self.assertTrue(mock_abort.called)
+        self.assertTrue(mock_get_distro.called)
+        self.assertTrue(v.askYesNoQuestion.called)
+
+    @mock.patch("DistUpgrade.DistUpgradeController.get_distro")
+    def test_double_check_source_distribution_continue(self, mock_get_distro):
+        """
+        test that an upgrade from feisty with a sources.list containing
+        hardy asks a question, and if continued, does something.
+        """
+        shutil.copy(os.path.join(self.testdir, "sources.list.hardy"),
+                    os.path.join(self.testdir, "sources.list"))
+        apt_pkg.config.set("Dir::Etc::sourcelist", "sources.list")
+        v = mock.Mock()
+        v.askYesNoQuestion.return_value=True
+        d = DistUpgradeController(v, datadir=self.testdir)
+        d.config.set("Distro", "BaseMetaPkgs", "ubuntu-minimal")
+        mock_get_distro.return_value = UbuntuDistribution("Ubuntu", "feisty",
+                                                          "Ubuntu Feisty Fawn",
+                                                          "7.04")
+        d.openCache(lock=False)
+        res = d.updateSourcesList()
+        self.assertTrue(mock_get_distro.called)
+        self.assertTrue(res)
+
+        # now test the result
+        #print(open(os.path.join(self.testdir,"sources.list")).read())
+        
+        # The result here is not really all that helpful, hence we
+        # added the question in the first place. But still better to
+        # check what it does than to not check it.
+        self._verifySources2Way("""
+# main repo
+# deb cdrom:[Ubuntu 8.10 _foo]/ hardy main
+# deb ftp://uk.archive.ubuntu.com/ubuntu/ hardy main restricted multiverse universe
+# deb http://de.archive.ubuntu.com/ubuntu/ hardy main restricted multiverse
+deb-src http://uk.archive.ubuntu.com/ubuntu/ hardy main restricted multiverse
+
+# deb http://security.ubuntu.com/ubuntu/ hardy-security main restricted
+# deb http://security.ubuntu.com/ubuntu/ hardy-security universe
+
+deb http://archive.ubuntu.com/ubuntu/ gutsy main
+""")
+        # check that the backup file was created correctly
+        self.assertEqual(0, subprocess.call(
+            ["cmp",
+             apt_pkg.config.find_file("Dir::Etc::sourcelist") + ".hardy",
+             apt_pkg.config.find_file("Dir::Etc::sourcelist") + ".distUpgrade"
+             ]))
 
     @mock.patch("DistUpgrade.DistUpgradeController.get_distro")
     def test_sources_list_inactive_mirror(self, mock_get_distro):