Ticket #1042: sugar-multi-version-bundles-fix.patch

src/jarabe/desktop/activitieslist.py

@@ -203 +203 @@
         for row in self._model:
             if row[ListModel.COLUMN_BUNDLE_ID] == bundle_id and \
                     row[ListModel.COLUMN_VERSION] == version:
-                self.remove(row.iter)
+                self._model.remove(row.iter)
                 return
 
     def _add_activity(self, activity_info):

src/jarabe/model/bundleregistry.py

@@ -324 +324 @@
         return False
 
     def install(self, bundle):
+        logging.debug("Trying to install bundle %r %r",
+            bundle.get_bundle_id(), bundle.get_activity_version())
         activities_path = env.get_user_activities_path()
 
-        if self.get_bundle(bundle.get_bundle_id()):
-            raise AlreadyInstalledException
-
         for installed_bundle in self._bundles:
             if bundle.get_bundle_id() == installed_bundle.get_bundle_id() and \
                     bundle.get_activity_version() == \
@@ -347 +346 @@
         elif not self.add_bundle(install_path):
             raise RegistrationException
 
-    def uninstall(self, bundle, force=False):        
+    def uninstall(self, bundle, force=False):
+        logging.debug("Trying to uninstall bundle %r %r",
+            bundle.get_bundle_id(), bundle.get_activity_version())
         # TODO treat ContentBundle in special way
         # needs rethinking while fixing ContentBundle support
         if isinstance(bundle, ContentBundle):