From cd50e8b76962428a9fd9020ed485936a323b2901 Mon Sep 17 00:00:00 2001
From: Ramin Yaghoubzadeh <ryaghoubzadeh@uni-bielefeld.de>
Date: Thu, 24 Apr 2014 15:25:52 +0200
Subject: [PATCH] Payload.merge() never merged anything at all: fixed.
---
ipaacalib/python/src/ipaaca/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ipaacalib/python/src/ipaaca/__init__.py b/ipaacalib/python/src/ipaaca/__init__.py
index db2f873..0bd8bbb 100755
--- a/ipaacalib/python/src/ipaaca/__init__.py
+++ b/ipaacalib/python/src/ipaaca/__init__.py
@@ -209,7 +209,7 @@ class Payload(dict):
if type(v)==str:
v=unicode(v,'utf8')
self.iu._modify_payload(is_delta=True, new_items=payload, keys_to_remove=[], writer_name=writer_name)
- r = dict.update(payload) # batch update
+ r = dict.update(self, payload) # batch update
#print("Payload.merge() OUT")
self._batch_update_lock.release()
return r
--
GitLab