[Commits] sugar-toolkit branch master updated.

[Daniel Drake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "/home/olpc-code/git/sugar-toolkit".

The branch, master has been updated
       via  3f1509cd225383ce738eb2bd1ee8e20f9b7c7824 (commit)
      from  e0c2017c50f9099041352e63e5355c9b1196aed2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

 src/sugar/bundle/activitybundle.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 3f1509cd225383ce738eb2bd1ee8e20f9b7c7824
Author: Daniel Drake <dsd at laptop.org>
Date:   Fri Dec 5 21:55:34 2008 +0000

    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)
-----------------------------------------------------------------------


--
/home/olpc-code/git/sugar-toolkit