diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-07-04 16:30:21 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-07-04 16:30:21 (GMT) |
| commit | 7fd29a508fe8a47667ae1853ee393f05e29c6c8c (patch) | |
| tree | c3a8c0673468864ab3718c7b3428a01d64a7b97e /src | |
| parent | 7314d62ef5d4f072ee8ce7a55f7db0a87195e996 (diff) | |
| parent | f954f0c9a47cff55a7828c335205ec33f8c0c8b6 (diff) | |
| download | SCons-7fd29a508fe8a47667ae1853ee393f05e29c6c8c.zip SCons-7fd29a508fe8a47667ae1853ee393f05e29c6c8c.tar.gz SCons-7fd29a508fe8a47667ae1853ee393f05e29c6c8c.tar.bz2 | |
Merged in dirkbaechle/scons (pull request #146)
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Tool/docbook/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/docbook/__init__.py b/src/engine/SCons/Tool/docbook/__init__.py index aacc26d..26a1a95 100644 --- a/src/engine/SCons/Tool/docbook/__init__.py +++ b/src/engine/SCons/Tool/docbook/__init__.py @@ -242,7 +242,7 @@ def __xml_scan(node, env, path, arg): styledoc = libxml2.parseFile(xsl_file) style = libxslt.parseStylesheetDoc(styledoc) - doc = libxml2.parseFile(str(node)) + doc = libxml2.readFile(str(node), None, libxml2.XML_PARSE_NOENT) result = style.applyStylesheet(doc, None) depfiles = [] @@ -348,7 +348,7 @@ def __xinclude_libxml2(target, source, env): Resolving XIncludes, using the libxml2 module. """ doc = libxml2.readFile(str(source[0]), None, libxml2.XML_PARSE_NOENT) - doc.xincludeProcess() + doc.xincludeProcessFlags(libxml2.XML_PARSE_NOENT) doc.saveFile(str(target[0])) doc.freeDoc() |