Merge lp:~ilidrissi.amine/software-center/fix-conflicting-packages into lp:software-center

[Mohamed Amine Ilidrissi]

This branch fixes bug 554319.

[lp:~ilidrissi.amine/software-center/fix-conflicting-packages]

1074. By Mohamed Amine Ilidrissi on 2010-08-26

merge with trunk.

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-26 18:44:15 +0000
+++ debian/changelog	2010-08-26 18:54:41 +0000
@@ -22,8 +22,10 @@
   
   [ Mohamed Amine IL Idrissi ]
   * Do not include download size of installed app.
-  
- -- Gary Lasker <[e-mail]>  Thu, 26 Aug 2010 14:36:13 -0400
+  * An alert will show if you try to remove conflicting packages (LP: #554319)
+  * The dependency remove alert will now show application icons
+
+ -- Mohamed Amine IL Idrissi <[e-mail]>  Thu, 26 Aug 2010 18:44:58 +0000
 
 software-center (2.1.13) maverick; urgency=low
 

=== modified file 'softwarecenter/app.py'
--- softwarecenter/app.py	2010-08-26 15:26:00 +0000
+++ softwarecenter/app.py	2010-08-26 18:54:41 +0000
@@ -498,7 +498,32 @@
                 iconpath = self.get_icon_filename(appdetails.icon, self.APP_ICON_SIZE)
                 
                 if not dialogs.confirm_remove(None, self.datadir, primary, self.cache,
-                                            button_text, iconpath, depends):
+                                            button_text, iconpath, depends, self.icons, self.db):
+                    # for appdetailsview-webkit
+                    # self._set_action_button_sensitive(True)
+
+                    self.backend.emit("transaction-stopped", app.pkgname)
+                    return
+        elif action == "install":
+            # If we are installing a package, check for dependencies that will 
+            # also be removed and show a dialog for confirmation
+            # generic removal text (fixing LP bug #554319)
+            (primary, button_text) = self.distro.get_install_warning_text(self.cache,
+                                                                          appdetails.pkg,
+                                                                          app.name)
+                                                                          
+            # ask for confirmation if we have depends that will be removed
+            depends = []
+            deps_remove = self.cache.get_all_deps_removing(appdetails.pkg)
+            for dep in deps_remove:
+                if self.cache[dep].installed != None:
+                    depends.append(dep)
+            
+            if depends:
+                iconpath = self.get_icon_filename(appdetails.icon, self.APP_ICON_SIZE)
+                
+                if not dialogs.confirm_remove(None, self.datadir, primary, self.cache,
+                                            button_text, iconpath, depends, self.icons, self.db):
                     # for appdetailsview-webkit
                     # self._set_action_button_sensitive(True)
 

=== modified file 'softwarecenter/distro/Debian.py'
--- softwarecenter/distro/Debian.py	2010-08-13 16:50:30 +0000
+++ softwarecenter/distro/Debian.py	2010-08-26 18:54:41 +0000
@@ -71,6 +71,37 @@
                 depends = None
                 break
         return (primary, button_text)
+    
+    def get_install_warning_text(self, cache, pkg, appname):
+        primary = _("To install %s, these items must be removed:" % appname)
+        button_text = _("Install Anyway")
+
+        depends = []
+        deps_remove = self.cache.get_all_deps_removing(pkg)
+        for dep in deps_remove:
+            if self.cache[dep].installed != None:
+                depends.append(dep)
+
+        # alter it if a meta-package is affected
+        for m in depends:
+            if cache[m].section == "metapackages":
+                primary = _("If you install %s, future updates will not "
+                              "include new items in <b>%s</b> set. "
+                              "Are you sure you want to continue?") % (appname, cache[m].installed.summary)
+                button_text = _("Install Anyway")
+                depends = []
+                break
+
+        # alter it if an important meta-package is affected
+        for m in self.IMPORTANT_METAPACKAGES:
+            if m in depends:
+                primary = _("Installing %s may cause core applications to "
+                            "be removed. "
+                            "Are you sure you want to continue?" % appname)
+                button_text = _("Install Anyway")
+                depends = None
+                break
+        return (primary, button_text)
 
     def get_distro_codename(self):
         if not hasattr(self ,"codename"):

=== modified file 'softwarecenter/distro/Ubuntu.py'
--- softwarecenter/distro/Ubuntu.py	2010-08-25 13:16:17 +0000
+++ softwarecenter/distro/Ubuntu.py	2010-08-26 18:54:41 +0000
@@ -80,6 +80,37 @@
                 depends = None
                 break
         return (primary, button_text)
+    
+    def get_install_warning_text(self, cache, pkg, appname):
+        primary = _("To install %s, these items must be removed:" % appname)
+        button_text = _("Install Anyway")
+
+        depends = []
+        deps_remove = cache.get_all_deps_removing(pkg)
+        for dep in deps_remove:
+            if cache[dep].installed != None:
+                depends.append(dep)
+
+        # alter it if a meta-package is affected
+        for m in depends:
+            if cache[m].section == "metapackages":
+                primary = _("If you install %s, future updates will not "
+                              "include new items in <b>%s</b> set. "
+                              "Are you sure you want to continue?") % (appname, cache[m].installed.summary)
+                button_text = _("Install Anyway")
+                depends = []
+                break
+
+        # alter it if an important meta-package is affected
+        for m in self.IMPORTANT_METAPACKAGES:
+            if m in depends:
+                primary = _("Installing %s may cause core applications to "
+                            "be removed. "
+                            "Are you sure you want to continue?" % appname)
+                button_text = _("Install Anyway")
+                depends = None
+                break
+        return (primary, button_text)
 
     def get_distro_codename(self):
         if not hasattr(self ,"codename"):

=== modified file 'softwarecenter/view/dialogs.py'
--- softwarecenter/view/dialogs.py	2010-07-14 15:47:46 +0000
+++ softwarecenter/view/dialogs.py	2010-08-26 18:54:41 +0000
@@ -34,7 +34,7 @@
             else:
                 print >> sys.stderr, "WARNING: can not get name for '%s'" % o
 
-def confirm_remove(parent, datadir, primary, cache, button_text, icon_path, depends):
+def confirm_remove(parent, datadir, primary, cache, button_text, icon_path, depends, icons, db):
     """Confirm removing of the given app with the given depends"""
     glade_dialog = SimpleGladeDialog(datadir)
     dialog = glade_dialog.dialog_dependency_alert
@@ -53,7 +53,7 @@
     # add the dependencies
     vbox = dialog.get_content_area()
     # FIXME: make this a generic pkgview widget
-    view = PkgNamesView(_("Dependency"), cache, depends)
+    view = PkgNamesView(_("Dependency"), cache, depends, icons, db)
     view.set_headers_visible(False)
     glade_dialog.scrolledwindow_dependencies.add(view)
     glade_dialog.scrolledwindow_dependencies.show_all()
@@ -63,7 +63,7 @@
     if result == gtk.RESPONSE_ACCEPT:
         return True
     return False
-    
+
 def confirm_repair_broken_cache(parent, datadir):
     glade_dialog = SimpleGladeDialog(datadir)
     dialog = glade_dialog.dialog_broken_cache

=== modified file 'softwarecenter/view/pkgview.py'
--- softwarecenter/view/pkgview.py	2010-07-08 08:11:34 +0000
+++ softwarecenter/view/pkgview.py	2010-08-26 18:54:41 +0000
@@ -19,6 +19,7 @@
 
 import gtk
 import pango
+from softwarecenter.db.application import Application
 
 #FIXME: These need to come from the main app
 ICON_SIZE = 24
@@ -30,7 +31,7 @@
     (COL_ICON,
      COL_TEXT) = range(2)
 
-    def __init__(self, header, cache, pkgnames):
+    def __init__(self, header, cache, pkgnames, icons, db):
         super(PkgNamesView, self).__init__()
         model = gtk.ListStore(gtk.gdk.Pixbuf, str)
         self.set_model(model)
@@ -44,7 +45,14 @@
         for pkgname in sorted(pkgnames):
             s = "%s \n<small>%s</small>" % (
                 cache[pkgname].installed.summary.capitalize(), pkgname)
-            # FIXME: use xapian query here to find a matching icon
-            pix = gtk.gdk.pixbuf_new_from_file_at_size(MISSING_APP_ICON, 
-                                                       ICON_SIZE, ICON_SIZE)
-            row = model.append([pix, s])
+            
+            app_details = Application("", pkgname).get_details(db)
+            proposed_icon = app_details.icon
+            if not proposed_icon or not icons.has_icon(proposed_icon):
+                proposed_icon = MISSING_APP_ICON
+            try:
+                pix = icons.load_icon(proposed_icon, ICON_SIZE, ()).scale_simple(ICON_SIZE, 
+                                      ICON_SIZE, gtk.gdk.INTERP_BILINEAR)
+                row = model.append([pix, s])
+            except TypeError:
+                logging.warning("cant set icon for '%s' " % pkgname)