From 45f50db2b4e01530a996e8a335a33698dba2ed5f Mon Sep 17 00:00:00 2001 From: David Mulder Date: Sat, 26 Jan 2019 08:53:18 -0700 Subject: [PATCH] '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 Reviewed-by: Andrew Bartlet Reviewed-by: Noel Power Reviewed-by: Andreas Schneider (cherry picked from commit 8e7b63a17112c012652d0c85ef8a45870e83d589) --- docs-xml/wscript_build | 4 ++-- 1 file 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, -- 2.11.0