Attachment 18213 Details for Bug 15540 – backported patch for 4.18 and 4.19

[patch] backported patch for 4.18 and 4.19

0002-docs-xml-use-XML_CATALOG_FILES-env-var-if-defined.patch (text/plain), 1.53 KB, created by Björn Jacke on 2023-12-29 14:51:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Jacke

Created: 2023-12-29 14:51:21 UTC

Size: 1.53 KB

patch

obsolete

>From cef2110fe8fa279b2f38bfe7b3639b16d96527e9 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <bjacke@samba.org>
>Date: Mon, 25 Dec 2023 19:50:55 +0100
>Subject: [PATCH 2/3] docs-xml: use XML_CATALOG_FILES env var if defined
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Thanks to Thierry LARONDE for the fix.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15540
>
>Signed-off-by: BjÃ¶rn Jacke <bjacke@samba.org>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>(cherry picked from commit b9f32b32e0e1463b8ca3e696d682ecf86503464b)
>---
> buildtools/wafsamba/wafsamba.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
>index 40c7b866fba..2d20eabbc8b 100644
>--- a/buildtools/wafsamba/wafsamba.py
>+++ b/buildtools/wafsamba/wafsamba.py
>@@ -1183,7 +1183,7 @@ def SAMBAMANPAGES(bld, manpages, extra_source=None):
>     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_CATALOG = bld.bldnode.abspath() + '/docs-xml/build/catalog.xml'
>-    bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file:///usr/local/share/xml/catalog file://' + bld.env.SAMBA_CATALOG
>+    bld.env.SAMBA_CATALOGS = os.getenv('XML_CATALOG_FILES', 'file:///etc/xml/catalog file:///usr/local/share/xml/catalog') + ' file://' + bld.env.SAMBA_CATALOG
> 
>     for m in manpages.split():
>         source = [m + '.xml']
>-- 
>2.41.0
>

Flags:

metze: review+

Actions: View

Attachments on bug 15540: 18206 | 18213