Re: [gentoo-portage-dev] [PATCH] bin/ebuild: fix EBUILD_FORCE_TEST / RESTRICT interaction (bug 601466)

[Brian Dolbec]

On Fri,  2 Dec 2016 22:07:39 -0800
Zac Medico <zmedico@g.o> wrote:

> Ensure that config adjustments are applied to all relevant
> config instances, in order to prevent inconsistencies like
> the one that triggered bug 601466.
>
> X-Gentoo-Bug: 601466
> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=601466
> ---
>  bin/ebuild | 23 ++++++++++++++++-------
>  1 file changed, 16 insertions(+), 7 deletions(-)
>
> diff --git a/bin/ebuild b/bin/ebuild
> index 1f99177..e8b8bae 100755
> --- a/bin/ebuild
> +++ b/bin/ebuild
> @@ -244,7 +244,11 @@ if mytree == "porttree" and
> build_dir_phases.intersection(pargs): ebuild_changed = \
>  		portage.portdb._pull_valid_cache(cpv, ebuild,
> ebuild_portdir)[0] is None
> -tmpsettings = portage.config(clone=portage.settings)
> +# Make configuration adjustments to portage.portdb.doebuild_settings,
> +# in order to enforce consistency for EBUILD_FORCE_TEST support
> +# (see bug 601466).
> +tmpsettings = portage.portdb.doebuild_settings
> +
>  tmpsettings["PORTAGE_VERBOSE"] = "1"
>  tmpsettings.backup_changes("PORTAGE_VERBOSE")
>
> @@ -272,6 +276,17 @@ if "merge" in pargs and "noauto" in
> tmpsettings.features: print("Disabling noauto in features... merge
> disables it. (qmerge doesn't)") tmpsettings.features.discard("noauto")
>
> +if 'digest' in tmpsettings.features:
> +	if pargs and pargs[0] not in ("digest", "manifest"):
> +		pargs = ['digest'] + pargs
> +	# We only need to build digests on the first pass.
> +	tmpsettings.features.discard('digest')
> +
> +# Now that configuration adjustments are complete, create a clone of
> +# tmpsettings. The current instance refers to
> portdb.doebuild_settings, +# and we want to avoid the possibility of
> unintended side-effects. +tmpsettings =
> portage.config(clone=tmpsettings) +
>  try:
>  	metadata = dict(zip(Package.metadata_keys,
>  		portage.db[portage.settings['EROOT']][mytree].dbapi.aux_get(
> @@ -315,12 +330,6 @@ def stale_env_warning():
>  				open(os.path.join(tmpsettings['PORTAGE_BUILDDIR'],
>  					'.ebuild_changed'),
> 'w').close()
> -if 'digest' in tmpsettings.features:
> -	if pargs and pargs[0] not in ("digest", "manifest"):
> -		pargs = ['digest'] + pargs
> -	# We only need to build digests on the first pass.
> -	tmpsettings.features.discard('digest')
> -
>  checked_for_stale_env = False
>
>  for arg in pargs:

looks fine to me

-- 
Brian Dolbec <dolsen>