diff options
| author | Sascha 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) |
| commit | eab86c189d216f33dff85b5e2d0a77d266beef62 (patch) | |
| tree | 13e973daba750d0d53a34de269612f847a27d1b4 | |
| parent | a7c38041f2bf8cf878490b5ca4173fe02df601c3 (diff) | |
| parent | 0cffadcab30517196095cbb3b81bf3958bc0acc7 (diff) | |
Merge commit 'refs/top-bases/t/testsuite' into t/testsuite
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/carquinyol/metadatastore.py | 4 |
3 files changed, 8 insertions, 2 deletions
@@ -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(): |