Attachment 8493 Details for Bug 9606 – Patch

[patch] Patch

0002-Use-OpenCSW-xml-catalog-and-work-around-bashism.patch (text/plain), 1.58 KB, created by Dagobert Michelsen on 2013-01-26 14:44:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dagobert Michelsen

Created: 2013-01-26 14:44:46 UTC

Size: 1.58 KB

patch

obsolete

>From ba8709ceee319e011615e6c21b7fb9129a4080c4 Mon Sep 17 00:00:00 2001
>From: Dagobert Michelsen <dam@opencsw.org>
>Date: Sat, 26 Jan 2013 15:32:48 +0100
>Subject: [PATCH] Use OpenCSW xml catalog and work around bashism
>
>---
> buildtools/wafsamba/wafsamba.py | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
>index 9409669..94964ca 100644
>--- a/buildtools/wafsamba/wafsamba.py
>+++ b/buildtools/wafsamba/wafsamba.py
>@@ -790,14 +790,15 @@ def SAMBAMANPAGES(bld, manpages):
>     '''build and install manual pages'''
>     bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl'
>     bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'
>     bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
>     for m in manpages.split():
>         source = m + '.xml'
>         bld.SAMBA_GENERATOR(m,
>                             source=source,
>                             target=m,
>                             group='final',
>-                            rule='''export XML_CATALOG_FILES="${SAMBA_CATALOGS}"
>+                            rule='''XML_CATALOG_FILES="${SAMBA_CATALOGS}"
>+                                    export XML_CATALOG_FILES
>                                     ${XSLTPROC} --xinclude --stringparam noreference 0 -o ${TGT}.xml --nonet ${SAMBA_EXPAND_XSL} ${SRC}
>                                     ${XSLTPROC} --nonet -o ${TGT} ${SAMBA_MAN_XSL} ${TGT}.xml'''
>                             )
>-- 
>1.8.1
>

Actions: View

Attachments on bug 9606: 8493