diff options
| author | Sascha Silbe <sascha.silbe@caravan.local> | 2010-10-05 17:10:32 (GMT) |
|---|---|---|
| committer | Sascha Silbe <sascha.silbe@caravan.local> | 2010-10-05 17:10:32 (GMT) |
| commit | afc3790b7f36c52be6fa33ebf0834b6c3ba28573 (patch) | |
| tree | a35c1bd82cb4615e89153aa704d0c5fa370de43c | |
| parent | dca14e6fd618039dbfc7c39f8bfa93d5e37eedf5 (diff) | |
| parent | 616efd38624b38beb3cacb35e3eb999ae54bbb86 (diff) | |
Merge branch 't/query-typed-props' into refs/top-bases/t/timestamp-range-query-fix
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/carquinyol/filestore.py | 8 |
3 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,6 @@ +v0.90.0 2010-09-29 +* Do not store symlinks #2362 + v0.89.4 2010-09-11 * metadata-only update sets filesize property to 0 #2229 * commit 3644fac reintroduced race condition, broke test suite #2104 diff --git a/configure.ac b/configure.ac index b50b88d..cf72e11 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([sugar-datastore],[0.89.4],[],[sugar-datastore]) +AC_INIT([sugar-datastore],[0.90.0],[],[sugar-datastore]) AC_PREREQ([2.59]) diff --git a/src/carquinyol/filestore.py b/src/carquinyol/filestore.py index 9724397..9eb975f 100644 --- a/src/carquinyol/filestore.py +++ b/src/carquinyol/filestore.py @@ -43,6 +43,14 @@ class FileStore(object): if file_path: if not os.path.isfile(file_path): raise ValueError('No file at %r' % file_path) + + if os.path.islink(file_path): + # Can't keep symlinks (especially pointed to removable medias). + # Later, optimizer will help with saving duplicates + file_path = os.path.realpath(file_path) + # We should not move original file + transfer_ownership = False + if transfer_ownership: try: logging.debug('FileStore moving from %r to %r', file_path, |