Merge lp:~mvo/software-center/fix-removal-warning-metapackages into lp:software-center

[Michael Vogt]

This branch fixes a missing warning when a metapackage like "ubuntu-desktop"
is marked for removal directly. Currently only indirect removals (e.g. removing
gedit which causes removal of ubuntu-desktop via a rdepends) is caught

[dobey (dobey)]

Would a regression test not be appropriate here?

[lp:~mvo/software-center/fix-removal-warning-metapackages]

3245. By Michael Vogt on 2012-12-17

add regression test for removal of core metapackages, thanks to dobey for suggesting this

3246. By Michael Vogt on 2012-12-17

merged trunk and resolved conflicts

[Michael Vogt (mvo)]

Yes, definitely. I added a test for the metapackages now.

[lp:~mvo/software-center/fix-removal-warning-metapackages]

3247. By Michael Vogt on 2012-12-17

fix pep8 issues

[dobey (dobey)]

review: Approve

=== modified file 'softwarecenter/distro/ubuntu.py'
--- softwarecenter/distro/ubuntu.py	2012-11-28 16:58:59 +0000
+++ softwarecenter/distro/ubuntu.py	2012-12-17 09:59:26 +0000
@@ -45,7 +45,11 @@
     ]
 
     # metapackages
-    IMPORTANT_METAPACKAGES = ("ubuntu-desktop", "kubuntu-desktop")
+    IMPORTANT_METAPACKAGES = (
+        "ubuntu-standard",
+        "ubuntu-minimal",
+        "ubuntu-desktop",
+        "kubuntu-desktop")
 
     # screenshot handling
     SCREENSHOT_THUMB_URL = ("http://screenshots.ubuntu.com/"

=== modified file 'softwarecenter/ui/gtk3/dialogs/dependency_dialogs.py'
--- softwarecenter/ui/gtk3/dialogs/dependency_dialogs.py	2012-12-14 16:44:25 +0000
+++ softwarecenter/ui/gtk3/dialogs/dependency_dialogs.py	2012-12-17 09:59:26 +0000
@@ -69,13 +69,17 @@
     # once it works
     if not appdetails.pkg:
         return True
-    depends = cache.get_packages_removed_on_remove(appdetails.pkg)
-    if not depends:
+    if app.pkgname in distro.IMPORTANT_METAPACKAGES:
+        displayed_depends = set([app.pkgname])
+    else:
+        displayed_depends = cache.get_packages_removed_on_remove(
+            appdetails.pkg)
+    if not displayed_depends:
         return True
     (primary, button_text) = distro.get_removal_warning_text(
-        db._aptcache, appdetails.pkg, app.name, depends)
+        db._aptcache, appdetails.pkg, app.name, displayed_depends)
     return _confirm_internal(parent, app, db, icons, primary,
-        button_text, depends, cache)
+        button_text, displayed_depends, cache)
 
 
 def _get_confirm_internal_dialog(parent, app, db, icons, primary,

=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview.py'
--- softwarecenter/ui/gtk3/views/appdetailsview.py	2012-12-17 09:01:00 +0000
+++ softwarecenter/ui/gtk3/views/appdetailsview.py	2012-12-17 09:59:26 +0000
@@ -2005,10 +2005,9 @@
 
         # if we need to purchase/enable the report use the agent info
         if self.app_details.pkg_state in (
-            PkgStates.NEEDS_SOURCE,
-            PkgStates.NEEDS_PURCHASE,
-            PkgStates.PURCHASED_BUT_REPO_MUST_BE_ENABLED,
-            ):
+                PkgStates.NEEDS_SOURCE,
+                PkgStates.NEEDS_PURCHASE,
+                PkgStates.PURCHASED_BUT_REPO_MUST_BE_ENABLED):
             if self.app_details.size:
                 self.totalsize_info.set_value(
                     GLib.format_size(self.app_details.size))

=== modified file 'tests/gtk3/test_dialogs.py'
--- tests/gtk3/test_dialogs.py	2012-11-28 15:52:31 +0000
+++ tests/gtk3/test_dialogs.py	2012-12-17 09:59:26 +0000
@@ -1,10 +1,23 @@
 import unittest
 
+from mock import (
+    Mock,
+    patch,
+)
+
 from gi.repository import Gtk, GLib
-from tests.utils import setup_test_env
+from tests.utils import (
+    get_test_gtk3_icon_cache,
+    setup_test_env,
+    FakedCache,
+)
 setup_test_env()
 
 import softwarecenter.ui.gtk3.dialogs
+from softwarecenter.db.application import Application
+from softwarecenter.ui.gtk3.dialogs.dependency_dialogs import (
+    confirm_remove,
+    )
 from tests.gtk3.windows import get_test_window_dependency_dialog
 
 # window destory timeout
@@ -43,5 +56,31 @@
     def _close_dialog(self):
         softwarecenter.ui.gtk3.dialogs._DIALOG.response(0)
 
+
+class TestDependencyDialog(unittest.TestCase):
+
+    def setUp(self):
+        self.parent = None
+        self.db = Mock()
+        self.db._aptcache = FakedCache()
+        self.icons = get_test_gtk3_icon_cache()
+
+    @patch("softwarecenter.ui.gtk3.dialogs.dependency_dialogs"
+           "._get_confirm_internal_dialog")
+    def test_removing_dependency_dialog_warning_on_ud(self, mock):
+        app = Application("", "ubuntu-desktop")
+        self.db._aptcache["ubuntu-desktop"] = Mock()
+        confirm_remove(self.parent, app, self.db, self.icons)
+        self.assertTrue(mock.called)
+
+    @patch("softwarecenter.ui.gtk3.dialogs.dependency_dialogs"
+           "._get_confirm_internal_dialog")
+    def test_removing_dependency_dialog_warning_on_non_ud(self, mock):
+        app = Application("Some random app", "meep")
+        self.db._aptcache["meep"] = Mock()
+        confirm_remove(self.parent, app, self.db, self.icons)
+        self.assertFalse(mock.called)
+
+
 if __name__ == "__main__":
     unittest.main()

=== modified file 'tests/utils.py'
--- tests/utils.py	2012-12-14 08:38:18 +0000
+++ tests/utils.py	2012-12-17 09:59:26 +0000
@@ -486,3 +486,6 @@
                                   addons_to_remove, archive_suite):
         """Emit a fake signal "query-total-size-on-install-done" """
         self.emit("query-total-size-on-install-done", None, "", 0, 0)
+
+    def get_packages_removed_on_remove(self, pkgname):
+        return []