sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar-toolkit

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2008-09-11 10:52:35 +02:00
commit 9eb7e3a7df
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sugar/activity/bundlebuilder.py
View File

@ -31,7 +31,7 @@ from sugar import env
from sugar.bundle.activitybundle import ActivityBundle from sugar.bundle.activitybundle import ActivityBundle
IGNORE_DIRS = ['dist', '.git'] 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): def list_files(base_dir, ignore_dirs=None, ignore_files=None):
result = [] result = []

5
src/sugar/datastore/datastore.py
View File

@ -249,10 +249,9 @@ def write(ds_object, update_mtime=True, transfer_ownership=False,
properties['mtime'] = datetime.now().isoformat() properties['mtime'] = datetime.now().isoformat()
properties['timestamp'] = int(time.time()) 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 = '' file_path = ''
else:
file_path = ds_object._file_path
# FIXME: this func will be sync for creates regardless of the handlers # 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. # supplied. This is very bad API, need to decide what to do here.