Merge lp:~andrewsomething/ubuntu-release-upgrader/lp1199157 into lp:ubuntu-release-upgrader

[Andrew Starr-Bochicchio]

Disable proposed on upgrade to a development release.

[Brian Murray (brian-murray)]

This looks good but I also think it would help if entry.comment were used which I believe will add a comment to the entry in sources.list. That way if somebody is inspecting the file they will have an idea as to why it was commented out.

[Andrew Starr-Bochicchio (andrewsomething)]

Makes sense. Should it also change entry.dist even though it's disabling it?

[lp:~andrewsomething/ubuntu-release-upgrader/lp1199157]

2649. By Andrew Starr-Bochicchio on 2013-07-08

Check first if the entry is already disabled and add a comment when disabling.

[Brian Murray (brian-murray)]

Yes, that is what happens in test_private_ppa_transition so that makes sense too. Thanks for working on this!

[lp:~andrewsomething/ubuntu-release-upgrader/lp1199157]

2650. By Andrew Starr-Bochicchio on 2013-07-08

Update entry.dist even though we disable it to be consistent with other entrys that get disabled.

[Dimitri John Ledkov (xnox)]

I tend to go on a re-enable spree after do-release-upgrade.
Can the comment, perhaps, have a more warning tone?

"Not for humans during development stage of release %s."

[lp:~andrewsomething/ubuntu-release-upgrader/lp1199157]

2651. By Andrew Starr-Bochicchio on 2013-07-09

Paint the bikeshed a brighter red.

[Brian Murray (brian-murray)]

This is great, thanks for your investigation into this issue and your fix.

review: Approve

[Adolfo Jayme Barrientos (fitojb)]

In the string "Not for humans during development stage of release %s" I think the word "users" fits better than "humans"...

=== modified file 'DistUpgrade/DistUpgradeController.py'
--- DistUpgrade/DistUpgradeController.py	2013-05-07 15:48:46 +0000
+++ DistUpgrade/DistUpgradeController.py	2013-07-09 02:16:27 +0000
@@ -633,7 +633,17 @@
                 logging.debug("commenting landscape.canonical.com out")
                 entry.disabled = True
                 continue
-            
+
+            # Disable proposed on upgrade to a development release.
+            if (not entry.disabled and self.options
+                and self.options.devel_release == True and
+                "%s-proposed" % self.fromDist in entry.dist):
+                logging.debug("upgrade to development release, disabling proposed")
+                entry.dist = "%s-proposed" % self.toDist
+                entry.comment += _("Not for humans during development stage of release %s") % self.toDist
+                entry.disabled = True
+                continue
+
             # handle upgrades from a EOL release and check if there
             # is a supported release available
             if (not entry.disabled and

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-29 15:16:22 +0000
+++ debian/changelog	2013-07-09 02:16:27 +0000
@@ -1,3 +1,9 @@
+ubuntu-release-upgrader (1:0.197) UNRELEASED; urgency=low
+
+  * Disable proposed on upgrade to a development release (LP: #1199157).
+
+ -- Andrew Starr-Bochicchio <[e-mail]>  Mon, 08 Jul 2013 18:12:06 -0400
+
 ubuntu-release-upgrader (1:0.196) saucy; urgency=low
 
   * Re-sync the local copy of invoke-rc.d with the one from sysvinit.

=== added file 'tests/data-sources-list-test/sources.list.proposed_enabled'
--- tests/data-sources-list-test/sources.list.proposed_enabled	1970-01-01 00:00:00 +0000
+++ tests/data-sources-list-test/sources.list.proposed_enabled	2013-07-09 02:16:27 +0000
@@ -0,0 +1,5 @@
+deb http://archive.ubuntu.com/ubuntu feisty main restricted
+deb http://archive.ubuntu.com/ubuntu feisty-updates main restricted
+deb http://security.ubuntu.com/ubuntu/ feisty-security main restricted
+deb http://archive.ubuntu.com/ubuntu feisty-proposed universe main multiverse restricted
+

=== modified file 'tests/test_sources_list.py'
--- tests/test_sources_list.py	2012-12-14 10:47:33 +0000
+++ tests/test_sources_list.py	2013-07-09 02:16:27 +0000
@@ -17,6 +17,7 @@
 from DistUpgrade import DistUpgradeConfigParser
 from DistUpgrade.utils import url_downloadable
 import logging
+import mock
 
 DistUpgradeConfigParser.CONFIG_OVERRIDE_DIR = None
 
@@ -402,6 +403,28 @@
 deb http://archive.ubuntu.com/ubuntu gutsy-backports main restricted universe multiverse
 """)
 
+    def test_disable_proposed(self):
+        """
+        Test that proposed is disabled when upgrading to a development release.
+        """
+        shutil.copy(os.path.join(self.testdir, "sources.list.proposed_enabled"),
+            os.path.join(self.testdir, "sources.list"))
+        apt_pkg.config.set("Dir::Etc::sourcelist", "sources.list")
+        v = DistUpgradeViewNonInteractive()
+        options = mock.Mock()
+        options.devel_release = True
+        d = DistUpgradeController(v, options, datadir=self.testdir)
+        d.openCache(lock=False)
+        res = d.updateSourcesList()
+        self.assertTrue(res)
+
+        self._verifySources("""
+deb http://archive.ubuntu.com/ubuntu gutsy main restricted
+deb http://archive.ubuntu.com/ubuntu gutsy-updates main restricted
+deb http://security.ubuntu.com/ubuntu/ gutsy-security main restricted
+# deb http://archive.ubuntu.com/ubuntu gutsy-proposed universe main multiverse restricted #Not for humans during development stage of release gutsy
+""")
+
     def _verifySources(self, expected):
         sources_file = apt_pkg.config.find_file("Dir::Etc::sourcelist")
         sources_list = open(sources_file).read()