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

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 = []

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.