Maybe fix bug?

PennLINC · Oct 16, 2023 · 65a1da9 · 65a1da9
1 parent 2b169d6
commit 65a1da9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/xcp_d/tests/test_utils_utils.py b/xcp_d/tests/test_utils_utils.py
@@ -450,6 +450,12 @@ def test_make_dictionary():
     assert metadata["Sources"] == "a"
     assert out_metadata["Sources"] == ["a", "b"]
 
+    metadata = {"Sources": ["a"]}
+    out_metadata = utils._make_dictionary(metadata, Sources="b")
+    # Ensure the original dictionary isn't modified.
+    assert metadata["Sources"] == ["a"]
+    assert out_metadata["Sources"] == ["a", "b"]
+
     out_metadata = utils._make_dictionary(metadata=None, Sources=["b"])
     assert out_metadata["Sources"] == ["b"]
 

diff --git a/xcp_d/utils/utils.py b/xcp_d/utils/utils.py
@@ -554,9 +554,9 @@ def _make_dictionary(metadata=None, **kwargs):
         for key, value in kwargs.items():
             if key not in metadata.keys():
                 out_metadata[key] = value
-            elif isinstance(value, list):
+            elif isinstance(value, list) or isinstance(out_metadata[key], list):
                 # Append the values if they're a list
-                out_metadata[key] = _listify(out_metadata[key]) + value
+                out_metadata[key] = _listify(out_metadata[key]) + _listify(value)
             else:
                 # Overwrite the old value
                 out_metadata[key] = value