[Checkins] SVN: zc.buildout/trunk/ - Fixed wrong split when using the += and -= syntax (mustapha)

[Andreas Jung]

Log message for revision 87277:
  - Fixed wrong split when using the += and -= syntax (mustapha)
  

Changed:
  U   zc.buildout/trunk/CHANGES.txt
  U   zc.buildout/trunk/src/zc/buildout/buildout.py

-=-
Modified: zc.buildout/trunk/CHANGES.txt
===================================================================
--- zc.buildout/trunk/CHANGES.txt	2008-06-10 08:19:53 UTC (rev 87276)
+++ zc.buildout/trunk/CHANGES.txt	2008-06-10 08:59:51 UTC (rev 87277)
@@ -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/trunk/src/zc/buildout/buildout.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/buildout.py	2008-06-10 08:19:53 UTC (rev 87276)
+++ zc.buildout/trunk/src/zc/buildout/buildout.py	2008-06-10 08:59:51 UTC (rev 87277)
@@ -1156,12 +1156,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)