Commit bb462c80 authored by andreasjung's avatar andreasjung

- Fixed wrong split when using the += and -= syntax (mustapha)


git-svn-id: http://svn.zope.org/repos/main/zc.buildout/trunk@87277 62d5b8a3-27da-0310-9561-8e5933582275
parent 71b636b6
...@@ -4,9 +4,10 @@ Status ...@@ -4,9 +4,10 @@ Status
Change History Change History
************** **************
1.0.5 (unreleased) 1.0.5 (2008-06-10)
================== ==================
- Fixed wrong split when using the += and -= syntax (mustapha)
1.0.4 (2008-06-10) 1.0.4 (2008-06-10)
================== ==================
......
...@@ -1156,12 +1156,12 @@ def _update_section(s1, s2): ...@@ -1156,12 +1156,12 @@ def _update_section(s1, s2):
for k, v in s2.items(): for k, v in s2.items():
if k.endswith('+'): if k.endswith('+'):
key = k.rstrip(' +') key = k.rstrip(' +')
s2[key] = "\n".join(s1.get(key, "").split() + s2[k].split()) s2[key] = "\n".join(s1.get(key, "").split('\n') + s2[k].split('\n'))
del s2[k] del s2[k]
elif k.endswith('-'): elif k.endswith('-'):
key = k.rstrip(' -') key = k.rstrip(' -')
s2[key] = "\n".join([v for v in s1.get(key, "").split() s2[key] = "\n".join([v for v in s1.get(key, "").split('\n')
if v not in s2[k].split()]) if v not in s2[k].split('\n')])
del s2[k] del s2[k]
s1.update(s2) s1.update(s2)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment