Log message for revision 98491:
- Fixed wrong split when using the += and -= syntax (mustapha)
Changed:
U zc.buildout/branches/help-api/CHANGES.txt
U zc.buildout/branches/help-api/src/zc/buildout/buildout.py
-=-
Modified: zc.buildout/branches/help-api/CHANGES.txt
===================================================================
--- zc.buildout/branches/help-api/CHANGES.txt 2009-03-29 21:19:35 UTC (rev 98490)
+++ zc.buildout/branches/help-api/CHANGES.txt 2009-03-29 21:19:42 UTC (rev 98491)
@@ -4,9 +4,10 @@
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)
==================
Modified: zc.buildout/branches/help-api/src/zc/buildout/buildout.py
===================================================================
--- zc.buildout/branches/help-api/src/zc/buildout/buildout.py 2009-03-29 21:19:35 UTC (rev 98490)
+++ zc.buildout/branches/help-api/src/zc/buildout/buildout.py 2009-03-29 21:19:42 UTC (rev 98491)
@@ -1243,12 +1243,12 @@
for k, v in s2.items():
if k.endswith('+'):
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]
elif k.endswith('-'):
key = k.rstrip(' -')
- s2[key] = "\n".join([v for v in s1.get(key, "").split()
- if v not in s2[k].split()])
+ s2[key] = "\n".join([v for v in s1.get(key, "").split('\n')
+ if v not in s2[k].split('\n')])
del s2[k]
s1.update(s2)