Merge lp:~evfool/software-center/lp668382 into lp:software-center

[Robert Roth]

This branch fixes bug #668382:
* the removal warning text for core items in ubuntu (to match the wiki spec [1])
* fixed the logic to correctly work with important metapackages, as without this fix if there was a metapackage in the depends of the package to remove, the depends got set to [], so there was no chance to find any of the IMPORTANT_METAPACKAGES in the (already empty) depends
[1] https://wiki.ubuntu.com/SoftwarePackageOperations#removing

[Michael Vogt (mvo)]

Thanks Robert! The logic is indeed wrong, great that you noticed that. I tweaked your fix a tiny bit and just changed the order of the loops. I.e. the more important core meta pacakges loop is run first, then the less important check for generic metapackages.

review: Approve

=== modified file 'softwarecenter/distro/ubuntu.py'
--- softwarecenter/distro/ubuntu.py	2012-08-08 11:20:12 +0000
+++ softwarecenter/distro/ubuntu.py	2012-11-21 14:50:26 +0000
@@ -99,19 +99,18 @@
                               "Are you sure you want to continue?") % (appname,
                               cache[m].installed.summary)
                 button_text = _("Remove Anyway")
-                depends = []
                 break
 
         # alter it if an important meta-package is affected
         for m in self.IMPORTANT_METAPACKAGES:
             if m in depends:
-                primary = _("%s is a core application in Ubuntu. "
-                              "Uninstalling it may cause future upgrades "
+                primary = _("%s is a core item in Ubuntu. "
+                              "Removing it may cause future upgrades "
                               "to be incomplete. Are you sure you want to "
                               "continue?") % appname
                 button_text = _("Remove Anyway")
-                depends = None
                 break
+        depends = None
         return (primary, button_text)
 
     def get_license_text(self, component):