[Checkins] SVN: zc.buildout/trunk/

[Jim Fulton]

Log message for revision 103345:
  

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

-=-
Modified: zc.buildout/trunk/CHANGES.txt
===================================================================
--- zc.buildout/trunk/CHANGES.txt	2009-08-28 18:14:42 UTC (rev 103344)
+++ zc.buildout/trunk/CHANGES.txt	2009-08-28 18:14:44 UTC (rev 103345)
@@ -1,6 +1,19 @@
 Change History
 **************
 
+1.4.1 (2009-08-27)
+==================
+
+New Feature:
+
+- Added a debug built-in recipe to make writing some tests easier.
+
+Bugs fixed:
+
+- (introduced in 1.4.0) option incrementing (-=) and decrementing (-=)
+  didn't work in the buildout section.
+  https://bugs.launchpad.net/zc.buildout/+bug/420463
+
 1.4.0 (2009-08-26)
 ==================
 

Modified: zc.buildout/trunk/src/zc/buildout/buildout.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/buildout.py	2009-08-28 18:14:42 UTC (rev 103344)
+++ zc.buildout/trunk/src/zc/buildout/buildout.py	2009-08-28 18:14:44 UTC (rev 103345)
@@ -1372,6 +1372,7 @@
     return result
 
 def _update_section(s1, s2):
+    s2 = s2.copy() # avoid mutating the second argument, which is unexpected
     for k, v in s2.items():
         v2, note2 = v
         if k.endswith('+'):

Modified: zc.buildout/trunk/src/zc/buildout/tests.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/tests.py	2009-08-28 18:14:42 UTC (rev 103344)
+++ zc.buildout/trunk/src/zc/buildout/tests.py	2009-08-28 18:14:44 UTC (rev 103345)
@@ -2557,7 +2557,42 @@
     ['demo', 'demoneeded', 'extraversiondemo']
     """
 
+def increment_buildout_options():
+    r"""
+    >>> write('b1.cfg', '''
+    ... [buildout]
+    ... parts = p1
+    ... x = 1
+    ... y = a
+    ...     b
+    ...
+    ... [p1]
+    ... recipe = zc.buildout:debug
+    ... foo = ${buildout:x} ${buildout:y}
+    ... ''')
 
+    >>> write('buildout.cfg', '''
+    ... [buildout]
+    ... extends = b1.cfg
+    ... parts += p2
+    ... x += 2
+    ... y -= a
+    ...
+    ... [p2]
+    ... <= p1
+    ... ''')
+
+    >>> print system(buildout),
+    Installing p1.
+      foo='1\n2 b'
+      recipe='zc.buildout:debug'
+    Installing p2.
+      foo='1\n2 b'
+      recipe='zc.buildout:debug'
+    """
+
+
+
 ######################################################################
 
 def create_sample_eggs(test, executable=sys.executable):