Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Silbe <sascha-pgp@silbe.org>2010-03-10 17:37:42 (GMT)
committer Sascha Silbe <sascha-pgp@silbe.org>2010-03-10 17:37:42 (GMT)
commit4d2b06eed41f5c1f146788f54662c44d7ec59ea5 (patch)
tree8ee932c847eb1a00c696abf9e23546a03df7169d
parent254dade97984975968fe8ec4b106ea386fae55a5 (diff)
parent87a88b6a7c95aaafd6dcf968189e75a75ad089c8 (diff)
Merge commit 'refs/top-bases/t/query-typed-props' into t/query-typed-props
-rw-r--r--NEWS4
-rw-r--r--configure.ac2
-rw-r--r--src/carquinyol/metadatastore.py4
3 files changed, 8 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 9147386..b20eb59 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+v0.87.4 2010-03-10
+* Do not remove internal metadata fields while rewriting object #1813
+* Auto detect mime type in copy-to-journal #586 (tomeu)
+
v0.87.3 2010-03-08
* rebuild index on migration #1787
diff --git a/configure.ac b/configure.ac
index c8a3ca9..ddf7ffb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([sugar-datastore],[0.87.3],[],[sugar-datastore])
+AC_INIT([sugar-datastore],[0.87.4],[],[sugar-datastore])
AC_PREREQ([2.59])
diff --git a/src/carquinyol/metadatastore.py b/src/carquinyol/metadatastore.py
index b75c755..5967017 100644
--- a/src/carquinyol/metadatastore.py
+++ b/src/carquinyol/metadatastore.py
@@ -4,6 +4,7 @@ from carquinyol import layoutmanager
from carquinyol import metadatareader
MAX_SIZE = 256
+_INTERNAL_KEYS = ['checksum']
class MetadataStore(object):
@@ -14,7 +15,8 @@ class MetadataStore(object):
os.makedirs(metadata_path)
else:
for key in os.listdir(metadata_path):
- os.remove(os.path.join(metadata_path, key))
+ if key not in _INTERNAL_KEYS:
+ os.remove(os.path.join(metadata_path, key))
metadata['uid'] = uid
for key, value in metadata.items():