Merge lp:~feldgendler/update-manager/574436 into lp:update-manager

[Alexey Feldgendler]

Proposed fix for bug #574436

Introduced the [ThirdPartyMirrors] configuration section for the distribution upgrader. All keys in it must have distinct names, but only values matter. Each value is a third-party source URI. Such whitelisted sources don't get disabled on upgrade; however, if they use "from" release name, it's replaced with the "to" release name.

[Michael Vogt (mvo)]

On Fri, Nov 18, 2011 at 03:19:29PM -0000, Alexey Feldgendler wrote:
> Alexey Feldgendler has proposed merging lp:~feldgendler/update-manager/574436 into lp:update-manager.
>
> Requested reviews:
> Michael Vogt (mvo)
> Related bugs:
> Bug #574436 in update-manager (Ubuntu): "Third party software is uninstalled on upgrade"
> https://bugs.launchpad.net/ubuntu/+source/update-manager/+bug/574436
>
> For more details, see:
> https://code.launchpad.net/~feldgendler/update-manager/574436/+merge/82694
>
> Proposed fix for bug #574436
>
> Introduced the [ThirdPartyMirrors] configuration section for the distribution upgrader. All keys in it must have distinct names, but only values matter. Each value is a third-party source URI. Such whitelisted sources don't get disabled on upgrade; however, if they use "from" release name, it's replaced with the "to" release name.

Thanks, I merged this with a small tweak (see below).

> + self.valid_3p_mirrors = [pair[1] for pair in self.config.items('ThirdPartyMirrors')]

This needs to test that "thirdPartyMirrors" is part of the config,
otherwise it crashes. I fixed that during the merge and is part of
trunk now.

Thanks a lot for your work on this!
 Michael

=== modified file 'DistUpgrade/DistUpgradeController.py'
--- DistUpgrade/DistUpgradeController.py	2011-11-16 09:14:46 +0000
+++ DistUpgrade/DistUpgradeController.py	2011-11-18 15:18:24 +0000
@@ -167,6 +167,7 @@
         self.forced_obsoletes = self.config.getlist("Distro","ForcedObsoletes")
         # list of valid mirrors that we can add
         self.valid_mirrors = self.config.getListFromFile("Sources","ValidMirrors")
+        self.valid_3p_mirrors = [pair[1] for pair in self.config.items('ThirdPartyMirrors')]
         # debugging
         #apt_pkg.Config.set("DPkg::Options::","--debug=0077")
 
@@ -603,8 +604,8 @@
             logging.debug("examining: '%s'" %  get_string_with_no_auth_from_source_entry(entry))
             # check if it's a mirror (or official site)
             validMirror = self.isMirror(entry.uri)
-            if validMirror or not mirror_check:
-                validMirror = True
+            thirdPartyMirror = not mirror_check or self.isThirdPartyMirror(entry.uri)
+            if validMirror or thirdPartyMirror:
                 # disabled/security/commercial/extras are special cases
                 # we use validTo/foundToDist to figure out if we have a 
                 # main archive mirror in the sources.list or if we 
@@ -628,14 +629,14 @@
                     logging.debug("entry '%s' updated to new dist" % get_string_with_no_auth_from_source_entry(entry))
                 elif entry.type == 'deb-src':
                     continue
-                else:
+                elif validMirror:
                     # disable all entries that are official but don't
                     # point to either "to" or "from" dist
                     entry.disabled = True
                     self.sources_disabled = True
                     logging.debug("entry '%s' was disabled (unknown dist)" % get_string_with_no_auth_from_source_entry(entry))
 
-                # if we make it to this point, we have a official mirror
+                # if we make it to this point, we have a official or third-party mirror
 
                 # check if the arch is powerpc or sparc and if so, transition
                 # to ports.ubuntu.com (powerpc got demoted in gutsy, sparc
@@ -660,9 +661,9 @@
                             if not comp in sync_components:
                                 continue
                             self.found_components[d].add(comp)
-                    
-            # disable anything that is not from a official mirror
-            if not validMirror:
+
+            else:
+                # disable anything that is not from a official mirror or a whitelisted third party
                 if entry.dist == self.fromDist:
                     entry.dist = self.toDist
                 entry.comment += " " + _("disabled on upgrade to %s") % self.toDist
@@ -1362,6 +1363,15 @@
                 return True
         return False
 
+    def isThirdPartyMirror(self, uri):
+        " check if uri is a whitelisted third-party mirror "
+        uri = uri.rstrip("/")
+        for mirror in self.valid_3p_mirrors:
+            mirror = mirror.rstrip("/")
+            if is_mirror(mirror, uri):
+                return True
+        return False
+
     def _getPreReqMirrorLines(self, dumb=False):
         " get sources.list snippet lines for the current mirror "
         lines = ""