From 3f1509cd225383ce738eb2bd1ee8e20f9b7c7824 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Fri, 05 Dec 2008 21:55:34 +0000
Subject: Simplify activity bundle installation

sugar-install-bundle is broken because ActivityBundle.install() gained a
required parameter. Please can we make it optional? This also fixes one
of the problems with the activity updater.
---
diff --git a/src/sugar/bundle/activitybundle.py b/src/sugar/bundle/activitybundle.py
index 97acc70..082fb70 100644
--- a/src/sugar/bundle/activitybundle.py
+++ b/src/sugar/bundle/activitybundle.py
@@ -26,6 +26,7 @@ import os
 import tempfile
 import logging
 
+from sugar import env
 from sugar.bundle.bundle import Bundle, \
     MalformedBundleException, NotInstalledException
 
@@ -275,7 +276,10 @@ class ActivityBundle(Bundle):
         """Get whether there should be a visible launcher for the activity"""
         return self._show_launcher
 
-    def install(self, install_dir, strict_manifest=False):
+    def install(self, install_dir=None, strict_manifest=False):
+        if install_dir is None:
+            install_dir = env.get_user_activities_path()
+
         self._unzip(install_dir)
 
         install_path = os.path.join(install_dir, self._zip_root_dir)
--
cgit v0.9.1