From 488744a005fb399af8d094ad7a62c1917410398c Mon Sep 17 00:00:00 2001 From: venkata edara Date: Wed, 22 Nov 2017 13:35:46 +0530 Subject: Rebase to Swift 2.15.1 (pike) Change-Id: I84ebb44c5c3cf2f80c50f2d4ae4bd92b619a4297 Signed-off-by: venkata edara Reviewed-on: https://review.gluster.org/18412 Reviewed-by: Prashanth Pai Tested-by: Prashanth Pai --- gluster/swift/obj/diskfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gluster/swift/obj') diff --git a/gluster/swift/obj/diskfile.py b/gluster/swift/obj/diskfile.py index be0669f..7ad5f26 100644 --- a/gluster/swift/obj/diskfile.py +++ b/gluster/swift/obj/diskfile.py @@ -1081,7 +1081,7 @@ class DiskFile(object): X_OBJECT_TYPE, X_TYPE] for key in sys_keys: - if key in orig_metadata: + if key in orig_metadata and key not in metadata: metadata[key] = orig_metadata[key] if X_OBJECT_TYPE not in orig_metadata: -- cgit