[Dextrose] [PATCH sugar] don't delete bundles on storage media (SL #2456)

[Aleksey Lim]

From: Sascha Silbe <sascha-pgp at silbe.org>

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 at schampijer.de>
Acked-by: Simon Schampijer <simon at schampijer.de>
---
 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 28644d6..9c3e8c0 100644
--- a/src/jarabe/journal/misc.py
+++ b/src/jarabe/journal/misc.py
@@ -101,21 +101,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
-- 
1.7.3.4