Apply += & -= in correct order with respect to extends

161fb191 · Julien Muchembled · af873650 · 161fb191
Commit 161fb191 authored May 05, 2020 by Julien Muchembled
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

src/zc/buildout/buildout.py src/zc/buildout/buildout.py +2 -4

No files found.
--- a/src/zc/buildout/buildout.py
+++ b/src/zc/buildout/buildout.py
@@ -1985,10 +1985,8 @@ def _update_section(s1, s2):
 def _update(d1, d2):
    for section in d2:
-        if section in d1:
+        # always call _update_section, so that += & -= are processed correctly
-            d1[section] = _update_section(d1[section], d2[section])
+        _update_section(d1.setdefault(section, {}), d2[section])
-        else:
-            d1[section] = d2[section]
    return d1
 def _recipe(options):