Dependency loop in docs-xml creation
Andrew Bartlett
abartlet at samba.org
Sat Jan 26 09:39:46 UTC 2019
On Fri, 2019-01-25 at 16:23 -0700, David Mulder via samba-technical
wrote:
> The creation of parameters.all.xml somehow contains a dependency
> loop.
> The code below is a workaround, but I haven't tracked down the cause.
>
> diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
> index 86600ae4a82..5b4cf5690ff 100644
> --- a/docs-xml/wscript_build
> +++ b/docs-xml/wscript_build
> @@ -141,10 +141,10 @@ def smbdotconf_generate_parameter_list(task):
> # 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'
> articles = " ".join(sorted([x.path_from(bld.path) for x in sources],
> - key=lambda m: m.split(os.sep)[-1]))
> + key=lambda m:
> m.split(os.sep)[-1])).replace(parameter_all, '')
>
> -parameter_all = 'smbdotconf/parameters.all.xml'
> bld.SAMBA_GENERATOR(parameter_all,
> source=articles,
> target=parameter_all,
I'm not sure what you mean by failed to track down the cause, it looks
like the cause to me, the purpose of the bld.SAMBA_GENERATOR at the end
of the hunk is to generate paramters.all.xml, so of course if it ends
up in the glob we have a problem.
I just would remove it from the sources list rather than have to do the
replace, if that works.
Can you make this a merge request?
Thanks,
Andrew Bartlett
--
Andrew Bartlett http://samba.org/~abartlet/
Authentication Developer, Samba Team http://samba.org
Samba Developer, Catalyst IT http://catalyst.net.nz/services/samba
More information about the samba-technical
mailing list