mirror of
https://github.com/samba-team/samba.git
synced 2025-07-30 19:42:05 +03:00
'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>
This commit is contained in:
committed by
Andreas Schneider
parent
c0ed5bd050
commit
8e7b63a171
@ -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,
|
||||
|
Reference in New Issue
Block a user