From 8734c25557c4c41a32e455e18595098dcc625b08 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Mon, 08 Mar 2010 18:02:19 +0000
Subject: Do not transfer ownership while copying objects #1688

---
diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py
index 1b4e236..50e8dc1 100644
--- a/src/jarabe/journal/model.py
+++ b/src/jarabe/journal/model.py
@@ -472,9 +472,9 @@ def copy(metadata, mount_point):
     metadata['mountpoint'] = mount_point
     del metadata['uid']
 
-    return write(metadata, file_path)
+    return write(metadata, file_path, transfer_ownership=False)
 
-def write(metadata, file_path='', update_mtime=True):
+def write(metadata, file_path='', update_mtime=True, transfer_ownership=True):
     """Creates or updates an entry for that id
     """
     logging.debug('model.write %r %r %r' % (metadata.get('uid', ''), file_path,
@@ -488,11 +488,11 @@ def write(metadata, file_path='', update_mtime=True):
             object_id = _get_datastore().update(metadata['uid'],
                                                  dbus.Dictionary(metadata),
                                                  file_path,
-                                                 True)
+                                                 transfer_ownership)
         else:
             object_id = _get_datastore().create(dbus.Dictionary(metadata),
                                                  file_path,
-                                                 True)
+                                                 transfer_ownership)
     else:
         if not os.path.exists(file_path):
             raise ValueError('Entries without a file cannot be copied to '
--
cgit v0.9.1