summaryrefslogtreecommitdiff
path: root/docs-xml
diff options
context:
space:
mode:
authorDavid Mulder <dmulder@suse.com>2019-01-26 08:53:18 -0700
committerAndreas Schneider <asn@cryptomilk.org>2019-01-29 22:09:07 +0100
commit8e7b63a17112c012652d0c85ef8a45870e83d589 (patch)
tree799d22fe2141708e9fd9e5407efa90452b14e25c /docs-xml
parentc0ed5bd05041e6a7a44c020588d9a1272f4be101 (diff)
downloadsamba-8e7b63a17112c012652d0c85ef8a45870e83d589.tar.gz
'articles' variable causes a dependency loop
This 'articles' variable contains 'smbdotconf/parameters.all.xml' and causes a dependency loop when creating parameters.all.xml Signed-off-by: David Mulder <dmulder@suse.com> Reviewed-by: Andrew Bartlet <abartlet@samba.org> Reviewed-by: Noel Power <noel.power@suse.com> Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'docs-xml')
-rw-r--r--docs-xml/wscript_build4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index 86600ae4a82..796b685c709 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -140,11 +140,11 @@ def smbdotconf_generate_parameter_list(task):
# Since nothing really forces sorting in glob, we have to sort by file name
# POSIX file systems aren't required to return sorted content but we want
# smb.conf parameters to be sorted alphabetically
-sources = bld.path.ant_glob("smbdotconf/**/*.xml", flat=False)
+parameter_all = 'smbdotconf/parameters.all.xml'
+sources = bld.path.ant_glob("smbdotconf/**/*.xml", flat=False, excl=parameter_all)
articles = " ".join(sorted([x.path_from(bld.path) for x in sources],
key=lambda m: m.split(os.sep)[-1]))
-parameter_all = 'smbdotconf/parameters.all.xml'
bld.SAMBA_GENERATOR(parameter_all,
source=articles,
target=parameter_all,