diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-10-23 23:39:36 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-10-23 23:41:54 +0200 |
| commit | 5c7d90f060938ebc0a8ff910abac5ee8300138d9 (patch) | |
| tree | 23a18b7f1a101654e0961c723b39dbea44ee35bd /ishtar_common/utils.py | |
| parent | 70130abaac331e535f99cf8bc8ebbc26525ecf5a (diff) | |
| download | Ishtar-5c7d90f060938ebc0a8ff910abac5ee8300138d9.tar.bz2 Ishtar-5c7d90f060938ebc0a8ff910abac5ee8300138d9.zip | |
Imports: fix dict merge on data update
Diffstat (limited to 'ishtar_common/utils.py')
| -rw-r--r-- | ishtar_common/utils.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py index 137f89469..b7a78a226 100644 --- a/ishtar_common/utils.py +++ b/ishtar_common/utils.py @@ -263,6 +263,8 @@ def update_data(data_1, data_2, merge=False): if data_2 and not data_1: return data_2 if not merge: + if data_2: + return data_2 return data_1 if data_2 and data_2 != data_1: return data_1 + " ; " + data_2 |