Merge lp:~brian-murray/ubuntu-release-upgrader/bug-1225016 into lp:ubuntu-release-upgrader

[Brian Murray]

I've modified the release upgrader to ensure that the metapackage information is in sync, but thought it could use a second pair of eyes.

=== modified file 'DistUpgrade/DistUpgradeCache.py'
--- DistUpgrade/DistUpgradeCache.py	2013-09-12 16:16:49 +0000
+++ DistUpgrade/DistUpgradeCache.py	2013-09-15 14:29:21 +0000
@@ -866,16 +866,16 @@
                     break
         # check if we actually found one
         if not metaPkgInstalled():
-            # FIXME: provide a list
+            meta_pkgs = ', '.join(metapkgs[0:-1])
             view.error(_("Can't guess meta-package"),
                        _("Your system does not contain a "
-                         "ubuntu-desktop, kubuntu-desktop, xubuntu-desktop or "
-                         "edubuntu-desktop package and it was not "
+                         "%s or %s package and it was not "
                          "possible to detect which version of "
-                        "Ubuntu you are running.\n "
+                         "Ubuntu you are running.\n "
                          "Please install one of the packages "
                          "above first using synaptic or "
-                         "apt-get before proceeding."))
+                         "apt-get before proceeding.") %
+                        (meta_pkgs, metapkgs[-1]))
             return False
         return True
 

=== modified file 'data/DistUpgrade.cfg'
--- data/DistUpgrade.cfg	2013-04-30 18:17:22 +0000
+++ data/DistUpgrade.cfg	2013-09-15 14:29:21 +0000
@@ -10,7 +10,7 @@
 # Distro contains global information about the upgrade
 [Distro]
 # the meta-pkgs we support
-MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-desktop, ubuntustudio-desktop, ichthux-desktop, mythbuntu-desktop, ubuntu-netbook, kubuntu-netbook, lubuntu-desktop
+MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-desktop, ubuntustudio-desktop, mythbuntu-desktop, kubuntu-netbook, lubuntu-desktop
 BaseMetaPkgs=ubuntu-minimal, ubuntu-standard
 Demotions=demoted.cfg
 RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin

=== modified file 'data/removal_blacklist.cfg'
--- data/removal_blacklist.cfg	2012-09-04 08:01:44 +0000
+++ data/removal_blacklist.cfg	2013-09-15 14:29:21 +0000
@@ -5,6 +5,8 @@
 kubuntu-desktop
 xubuntu-desktop
 lubuntu-desktop
+mythbuntu-desktop
+ubuntustudio-desktop
 # ubuntu-release-upgrader should not remove itself or update-manager
 update-manager
 update-manager-core