Fix ConfigKeyError in some cases when merging lists containing interp…

…olation values
omry · Feb 3, 2021 · 5a798e0 · 5a798e0
1 parent d53960c
commit 5a798e0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/news/422.bugfix b/news/422.bugfix
@@ -0,0 +1 @@
+Fix ConfigKeyError in some cases when merging lists containing interpolation values
diff --git a/omegaconf/basecontainer.py b/omegaconf/basecontainer.py
@@ -434,12 +434,12 @@ def _list_merge(dest: Any, src: Any) -> None:
             et = dest._metadata.element_type
             if is_structured_config(et):
                 prototype = OmegaConf.structured(et)
-                for item in src:
+                for item in src._iter_ex(resolve=False):
                     if isinstance(item, DictConfig):
                         item = OmegaConf.merge(prototype, item)
                     temp_target.append(item)
             else:
-                for item in src:
+                for item in src._iter_ex(resolve=False):
                     temp_target.append(item)
 
             dest.__dict__["_content"] = temp_target.__dict__["_content"]

diff --git a/tests/test_merge.py b/tests/test_merge.py
@@ -130,6 +130,11 @@
             ListConfig(content=[1, 2, 3]),
             id="list_merge_missing_onto",
         ),
+        pytest.param(
+            ({"a": 10, "list": []}, {"list": ["${a}"]}),
+            {"a": 10, "list": [10]},
+            id="merge_list_with_interpolation",
+        ),
         # Interpolations
         # value interpolation
         pytest.param(