diff options
| author | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-09-11 08:52:35 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-09-11 08:52:35 (GMT) |
| commit | 9eb7e3a7df01d9ac0dc74bcc29a484653a4d1600 (patch) | |
| tree | b4d170f8c539af591e86f54eabab3d77c6875a98 /src | |
| parent | 171e76cfb86924055db40337411af6057ced327d (diff) | |
| parent | e721f74f63334457f31cf9a6e21006fbd00b4db1 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar-toolkit
Diffstat (limited to 'src')
| -rw-r--r-- | src/sugar/activity/bundlebuilder.py | 2 | ||||
| -rw-r--r-- | src/sugar/datastore/datastore.py | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuilder.py index ec5e90a..0f99b0f 100644 --- a/src/sugar/activity/bundlebuilder.py +++ b/src/sugar/activity/bundlebuilder.py @@ -31,7 +31,7 @@ from sugar import env from sugar.bundle.activitybundle import ActivityBundle IGNORE_DIRS = ['dist', '.git'] -IGNORE_FILES = ['.gitignore', 'MANIFEST', '*.pyc', '*~', '*.bak'] +IGNORE_FILES = ['.gitignore', 'MANIFEST', '*.pyc', '*~', '*.bak', 'pseudo.po'] def list_files(base_dir, ignore_dirs=None, ignore_files=None): result = [] diff --git a/src/sugar/datastore/datastore.py b/src/sugar/datastore/datastore.py index d5dca7d..81c00e4 100644 --- a/src/sugar/datastore/datastore.py +++ b/src/sugar/datastore/datastore.py @@ -249,10 +249,9 @@ def write(ds_object, update_mtime=True, transfer_ownership=False, properties['mtime'] = datetime.now().isoformat() properties['timestamp'] = int(time.time()) - if ds_object.get_file_path(fetch=False) is None: + file_path = ds_object.get_file_path(fetch=False) + if file_path is None: file_path = '' - else: - file_path = ds_object._file_path # FIXME: this func will be sync for creates regardless of the handlers # supplied. This is very bad API, need to decide what to do here. |