Merge lp:~juliank/ubuntu-release-upgrader/valid-release into lp:ubuntu-release-upgrader

[Julian Andres Klode]

+ * DistUpgradeController.py: Only add a new entry for previously
+ unknown mirrors if the new entries distro is a valid release.
+ (LP: #1744722)

[lp:~juliank/ubuntu-release-upgrader/valid-release]

3096. By Julian Andres Klode on 2018-01-29

Add test case for bug #1744722

[Jean-Baptiste Lallement (jibel)]

LGTM. I also verified that with the sources.list files provided in bug 1744722 the bug is fixed. I tried to add various erroneous entries and sources.list is valid after rewrite. Thanks!

review: Approve

=== modified file 'DistUpgrade/DistUpgradeController.py'
--- DistUpgrade/DistUpgradeController.py	2018-01-29 09:41:09 +0000
+++ DistUpgrade/DistUpgradeController.py	2018-01-29 11:01:22 +0000
@@ -730,6 +730,8 @@
                 if main_was_missing:
                     if entry.dist in fromDists:
                         entry.dist = toDists[fromDists.index(entry.dist)]
+                    if entry.dist not in toDists:
+                        continue    # Unknown target, do not add this
                     # gather what components are enabled and are inconsistent
                     for d in ["%s" % self.toDist,
                               "%s-updates" % self.toDist,

=== modified file 'debian/changelog'
--- debian/changelog	2018-01-29 09:41:09 +0000
+++ debian/changelog	2018-01-29 11:01:22 +0000
@@ -5,6 +5,9 @@
     Partition messages as suggested by Steve Langasek in LP 1695666.
   * DistUpgradeFetcherKDE.py: Drop unneeded pyqtSlot, QUrl, breaks
     pyflakes
+  * DistUpgradeController.py: Only add a new entry for previously
+    unknown mirrors if the new entries distro is a valid release.
+    (LP: #1744722)
 
   [ Po-Hsu Lin ]
   * DistUpgrade/DistUpgradeController.py:

=== modified file 'tests/data-sources-list-test/sources.list.obsolete_mirror'
--- tests/data-sources-list-test/sources.list.obsolete_mirror	2015-11-17 17:30:05 +0000
+++ tests/data-sources-list-test/sources.list.obsolete_mirror	2018-01-29 11:01:22 +0000
@@ -8,3 +8,4 @@
 deb-src http://mirror.mcs.anl.gov/ubuntu feisty-updates main restricted universe multiverse
 ##deb-src http://mirror.mcs.anl.gov/ubuntu feisty-proposed main restricted universe multiverse
 deb-src http://mirror.mcs.anl.gov/ubuntu feisty-security main restricted universe multiverse
+deb https://example.com/3rd-party/deb/ stable main

=== modified file 'tests/test_sources_list.py'
--- tests/test_sources_list.py	2016-01-13 19:33:14 +0000
+++ tests/test_sources_list.py	2018-01-29 11:01:22 +0000
@@ -148,7 +148,7 @@
 
         # now test the result
         #print(open(os.path.join(self.testdir,"sources.list")).read())
-        self._verifySources("""
+        self._verifySources2Way("""
 # main repo
 # deb http://mirror.mcs.anl.gov/ubuntu gutsy main restricted universe multiverse # disabled on upgrade to gutsy
 # deb http://mirror.mcs.anl.gov/ubuntu gutsy-updates main restricted universe multiverse # disabled on upgrade to gutsy
@@ -158,6 +158,7 @@
 # deb-src http://mirror.mcs.anl.gov/ubuntu gutsy-updates main restricted universe multiverse # disabled on upgrade to gutsy
 ##deb-src http://mirror.mcs.anl.gov/ubuntu feisty-proposed main restricted universe multiverse
 # deb-src http://mirror.mcs.anl.gov/ubuntu gutsy-security main restricted universe multiverse # disabled on upgrade to gutsy
+# deb https://example.com/3rd-party/deb/ stable main # disabled on upgrade to gutsy
 deb http://archive.ubuntu.com/ubuntu/ gutsy main
 deb http://archive.ubuntu.com/ubuntu gutsy main restricted universe multiverse # auto generated by ubuntu-release-upgrader
 deb http://archive.ubuntu.com/ubuntu gutsy-updates main restricted universe multiverse # auto generated by ubuntu-release-upgrader
@@ -571,7 +572,17 @@
                 "expected entry '%s' in sources.list missing. got:\n'''%s'''" %
                 (l, sources_list))
 
-
+    def _verifySources2Way(self, expected):
+        self._verifySources(expected)
+        sources_file = apt_pkg.config.find_file("Dir::Etc::sourcelist")
+        with open(sources_file) as f:
+            sources_list = f.read()
+        for l in sources_list.split("\n"):
+            self.assertTrue(
+                l in expected.split("\n"),
+                "unexpected entry '%s' in sources.list. got:\n'''%s'''" %
+                (l, sources_list))
+                
 if __name__ == "__main__":
     import sys
     for e in sys.argv: