diff options
| author | Sascha Silbe <sascha-pgp@silbe.org> | 2010-10-17 10:47:58 (GMT) |
|---|---|---|
| committer | Sascha Silbe <sascha-pgp@silbe.org> | 2010-11-30 10:22:26 (GMT) |
| commit | a2e1f09c001a9d4ec5399934372e3afb5322cf63 (patch) | |
| tree | 0b26fd55a724c88137784058bd35c0764044119f | |
| parent | dd0fcdc103cdbeb052094e66e7812c786fe23e07 (diff) | |
don't delete bundles on storage media (SL #2456)
model.get_file() already wraps data store checkouts in TempFilePath. Because
misc.get_bundle() unconditionally wrapped the path returned by
model.get_file() in TempFilePath as well, bundles located on storage media
(which are referenced by their actual location, not copied or linked) were
deleted after misc.get_bundle() finished.
Tested-by: Simon Schampijer <simon@schampijer.de>
Acked-by: Simon Schampijer <simon@schampijer.de>
| -rw-r--r-- | src/jarabe/journal/misc.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py index 05ed1b6..d13aab0 100644 --- a/src/jarabe/journal/misc.py +++ b/src/jarabe/journal/misc.py @@ -103,21 +103,21 @@ def get_date(metadata): def get_bundle(metadata): try: if is_activity_bundle(metadata): - file_path = util.TempFilePath(model.get_file(metadata['uid'])) + file_path = model.get_file(metadata['uid']) if not os.path.exists(file_path): logging.warning('Invalid path: %r', file_path) return None return ActivityBundle(file_path) elif is_content_bundle(metadata): - file_path = util.TempFilePath(model.get_file(metadata['uid'])) + file_path = model.get_file(metadata['uid']) if not os.path.exists(file_path): logging.warning('Invalid path: %r', file_path) return None return ContentBundle(file_path) elif is_journal_bundle(metadata): - file_path = util.TempFilePath(model.get_file(metadata['uid'])) + file_path = model.get_file(metadata['uid']) if not os.path.exists(file_path): logging.warning('Invalid path: %r', file_path) return None |