This commit fixes several issue connected with the use of the <include> directive: First and foremost the XSLT chain was broken in a way that the include XSLT in combination with the PrettyPrinter XSLT were called not in the chain of stylesheets but together. This results in XML descriptions which duplicated the content and went invalid Another change is, when the include XSLT is called in the chain. This commit moves it to become the very first processing instruction such that the included data is part of all subsequent XSLT stylesheets. This also allows to use older schema versions in included XML data and they get automatically converted through the chain of XSLT stylesheets. Last change is the evaluation of the from= attribute value. This value is now interpreted as an URI. Currently only local URIs are supported. The reason to do this is because XSLT when processing a document resolves relative paths according to the file path of the master document. As kiwi does not change the original content that path with will be a /var/tmp location if one of the XSLT stylesheets were used. The documentation for this change was updated as well
31 lines
985 B
XML
31 lines
985 B
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
|
|
<image schemaversion="7.4" name="JeOS">
|
|
<description type="system">
|
|
<author>Marcus Schäfer</author>
|
|
<contact>ms@suse.com</contact>
|
|
<specification>Test for missing include reference</specification>
|
|
</description>
|
|
<include from="file://../data/nested_include.xml"/>
|
|
<preferences>
|
|
<version>1.1.0</version>
|
|
<packagemanager>zypper</packagemanager>
|
|
<locale>en_US</locale>
|
|
<keytable>us.map.gz</keytable>
|
|
<timezone>Europe/Berlin</timezone>
|
|
<rpm-excludedocs>true</rpm-excludedocs>
|
|
<type image="tbz"/>
|
|
</preferences>
|
|
<repository>
|
|
<source path="obs://13.2/repo/oss"/>
|
|
</repository>
|
|
<packages type="image">
|
|
<package name="patterns-openSUSE-base"/>
|
|
</packages>
|
|
<packages type="bootstrap">
|
|
<package name="udev"/>
|
|
<package name="filesystem"/>
|
|
<package name="glibc-locale"/>
|
|
</packages>
|
|
</image>
|