Merge lp:~dobey/ubuntuone-installer/fix-939797 into lp:ubuntuone-installer

[dobey]

Only install packages that haven't yet been installed.

[Roberto Alsina (ralsina)]

yay!

review: Approve

=== modified file 'ubuntuone/installer/__init__.py'
--- ubuntuone/installer/__init__.py	2012-02-17 21:46:16 +0000
+++ ubuntuone/installer/__init__.py	2012-02-24 18:17:44 +0000
@@ -19,6 +19,8 @@
 
 from gi.repository import GLib
 
+CLIENT_SHELL_PACKAGE = 'ubuntuone-client-gnome'
+
 CONTROL_PANEL_COMMAND = 'ubuntuone-control-panel-qt'
 CONTROL_PANEL_PACKAGE = 'ubuntuone-control-panel-qt'
 
 
=== modified file 'ubuntuone/installer/gui.py'
--- ubuntuone/installer/gui.py	2012-02-23 14:42:09 +0000
+++ ubuntuone/installer/gui.py	2012-02-24 18:17:44 +0000
@@ -21,9 +21,11 @@
 import os
 
 from gi.repository import Gtk, GObject, GLib, Gdk, Pango
-from ubuntuone.installer import (CONTROL_PANEL_COMMAND,
+from ubuntuone.installer import (CLIENT_SHELL_PACKAGE,
+                                 CONTROL_PANEL_COMMAND,
                                  CONTROL_PANEL_PACKAGE,
-                                 MUSIC_STORE_PACKAGE)
+                                 MUSIC_STORE_PACKAGE,
+                                 is_installed)
 
 # Some shenanigans to deal with pyflakes complaining
 inline_callbacks = None
@@ -196,6 +198,18 @@
             if os.path.exists(path):
                 return path
 
+    def __get_package_list(self):
+        """Build the list of packages, to only include non-installed ones."""
+        packages = []
+        if not is_installed(CONTROL_PANEL_PACKAGE, CONTROL_PANEL_COMMAND):
+            packages.append(CONTROL_PANEL_PACKAGE)
+        if not is_installed(MUSIC_STORE_PACKAGE):
+            packages.append(MUSIC_STORE_PACKAGE)
+        if not is_installed(CLIENT_SHELL_PACKAGE):
+            packages.append(CLIENT_SHELL_PACKAGE)
+
+        return packages
+
     def __got_response(self, dialog, response):
         """Handle the dialog response actions."""
         if response in [Gtk.ResponseType.CANCEL,
@@ -362,10 +376,7 @@
             Gtk.main_quit()
 
         transaction = yield self.client.install_packages(
-            package_names=[MUSIC_STORE_PACKAGE,
-                           'ubuntuone-client-gnome',
-                           CONTROL_PANEL_PACKAGE,
-                           ])
+            package_names=self.__get_package_list())
         transaction.connect('finished', finished)
         self.__apt_progress.set_transaction(transaction)
         transaction.run()