Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2008-12-05 21:55:34 (GMT)
committer Daniel Drake <dsd@laptop.org>2008-12-05 21:55:34 (GMT)
commit3f1509cd225383ce738eb2bd1ee8e20f9b7c7824 (patch)
tree9f9ceb6ea94db28a716379fd7f2caf55eea9fa19
parente0c2017c50f9099041352e63e5355c9b1196aed2 (diff)
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.
-rw-r--r--src/sugar/bundle/activitybundle.py6
1 files changed, 5 insertions, 1 deletions
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)