# HG changeset patch # User cmlenz # Date 1302701127 0 # Node ID 56c269e757375ecb58e1d08797f54adeda909d04 # Parent 0ab6b21b80102b2d8678c406d13bd08024d67a44 Ported r989 back to 0.6.x branch. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,15 @@ * ??? + +Version 0.6.1 +(???, from 0.6.x branch) +http://svn.edgewall.org/repos/bitten/tags/0.6.1 + + * Fix bug in error reporting in the `` recipe command when + using the Windows MSXML implementation. + + Version 0.6 (11 March 2011, from 0.6.x branch) http://svn.edgewall.org/repos/bitten/tags/0.6 @@ -16,6 +25,7 @@ * Fixed handling of configurations that point to deleted branches. * Fix hg:pull command for Trac 0.12. + Version 0.6b3 (21 October 2010, from 0.6.x branch) http://svn.edgewall.org/repos/bitten/tags/0.6b3 diff --git a/bitten/build/xmltools.py b/bitten/build/xmltools.py --- a/bitten/build/xmltools.py +++ b/bitten/build/xmltools.py @@ -70,13 +70,13 @@ srcdoc = win32com.client.Dispatch('MSXML2.DOMDocument.3.0') if not srcdoc.load(ctxt.resolve(src)): err = srcdoc.parseError - ctxt.error('Failed to parse XML source %s: %s', src, err.reason) + ctxt.error('Failed to parse XML source %s: %s' % (src, err.reason)) return styledoc = win32com.client.Dispatch('MSXML2.DOMDocument.3.0') if not styledoc.load(ctxt.resolve(stylesheet)): err = styledoc.parseError - ctxt.error('Failed to parse XSLT stylesheet %s: %s', stylesheet, - err.reason) + ctxt.error('Failed to parse XSLT stylesheet %s: %s' % + (stylesheet, err.reason)) return result = srcdoc.transformNode(styledoc)