'articles' variable causes a dependency loop
authorDavid Mulder <dmulder@suse.com>
Sat, 26 Jan 2019 15:53:18 +0000 (08:53 -0700)
committerAndreas Schneider <asn@cryptomilk.org>
Tue, 29 Jan 2019 21:09:07 +0000 (22:09 +0100)
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>
docs-xml/wscript_build

index 86600ae4a82c3327a030dd8d4ad853ad06e568da..796b685c709bd2d25c44406547157b2471b5bf14 100644 (file)
@@ -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,