diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-31 11:58:44 (GMT) |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-31 11:58:44 (GMT) |
| commit | b0c7a0546d8aaaf81e094ad8b8083dc266ae14a4 (patch) | |
| tree | ec0da9ddc9d4255e4b4005632e8d8481ab8b0a4e /lib | |
| parent | 2e86ad91b92dec5c8f062adc009cec47b7236b94 (diff) | |
| parent | dbbdf7383f2c94da2135fe0855d00945eab60115 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Conflicts:
NEWS
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sugar/activity/activity.py | 2 | ||||
| -rw-r--r-- | lib/sugar/activity/activityfactory.py | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/sugar/activity/activity.py b/lib/sugar/activity/activity.py index 14cadd7..55000f3 100644 --- a/lib/sugar/activity/activity.py +++ b/lib/sugar/activity/activity.py @@ -683,7 +683,7 @@ class Activity(Window, gtk.Container): if self._jobject.file_path: self.write_file(self._jobject.file_path) else: - file_path = os.path.join(self.get_activity_root(), 'tmp', + file_path = os.path.join(self.get_activity_root(), 'data', '%i' % time.time()) self.write_file(file_path) self._owns_file = True diff --git a/lib/sugar/activity/activityfactory.py b/lib/sugar/activity/activityfactory.py index 39ebebc..cd75edd 100644 --- a/lib/sugar/activity/activityfactory.py +++ b/lib/sugar/activity/activityfactory.py @@ -79,7 +79,16 @@ def get_environment(activity): environ = os.environ.copy() bin_path = os.path.join(activity.path, 'bin') + activity_root = env.get_profile_path(activity.bundle_id) + if not os.path.exists(activity_root): + os.mkdir(activity_root) + + data_dir = os.path.join(activity_root, 'data') + os.mkdir(data_dir) + + tmp_dir = os.path.join(activity_root, 'tmp') + os.mkdir(tmp_dir) environ['SUGAR_BUNDLE_PATH'] = activity.path environ['SUGAR_ACTIVITY_ROOT'] = activity_root |