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

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