Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
6
Merge Requests
6
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
slapos.buildout
Commits
161fb191
Commit
161fb191
authored
May 05, 2020
by
Julien Muchembled
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply += & -= in correct order with respect to extends
parent
af873650
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
src/zc/buildout/buildout.py
src/zc/buildout/buildout.py
+2
-4
No files found.
src/zc/buildout/buildout.py
View file @
161fb191
...
...
@@ -1985,10 +1985,8 @@ def _update_section(s1, s2):
def
_update
(
d1
,
d2
):
for
section
in
d2
:
if
section
in
d1
:
d1
[
section
]
=
_update_section
(
d1
[
section
],
d2
[
section
])
else
:
d1
[
section
]
=
d2
[
section
]
# always call _update_section, so that += & -= are processed correctly
_update_section
(
d1
.
setdefault
(
section
,
{}),
d2
[
section
])
return
d1
def
_recipe
(
options
):
...
...
Julien Muchembled
@jm
mentioned in commit
44ce8371
·
May 16, 2020
mentioned in commit
44ce8371
mentioned in commit 44ce837101ed6833f31ccd1c96b31b9c739f94e1
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment