diff options
author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-11-14 05:34:57 (GMT) |
---|---|---|
committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-11-14 05:34:57 (GMT) |
commit | 11952259ed7d0e76e2b6eb1385d572ef017e538d (patch) | |
tree | bb91249c3ea21bebf766e208d8c9ee0d42ce4f76 | |
parent | 44ff83e352aebc6a8c35d731ca4eefa077b43d1b (diff) | |
parent | 00105b1389aa455da4706ef53356fb2aec8bf290 (diff) |
Merge branch 'master' of git.sugarlabs.org:sugar/mainline
-rwxr-xr-x | bin/sugar-session | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/sugar-session b/bin/sugar-session index 6d2435e..3c86f3e 100755 --- a/bin/sugar-session +++ b/bin/sugar-session @@ -272,7 +272,7 @@ def intro_window_done_cb(window): def main(): try: - from sugar import env + from sugar3 import env # Remove temporary files. See http://bugs.sugarlabs.org/ticket/1876 data_dir = os.path.join(env.get_profile_path(), 'data') shutil.rmtree(data_dir, ignore_errors=True) @@ -283,7 +283,7 @@ def main(): # starting if (for example) the disk is full or read-only. print 'logs cleanup failed: %s' % e - from sugar import logger + from sugar3 import logger # NOTE: This needs to happen so early because some modules register translatable # strings in the module scope. from jarabe import config |