Re: [gentoo-portage-dev] [PATCH] make.defaults: negative incrementals in USE_EXPAND (530222)

[Brian Dolbec]

On Wed, 26 Nov 2014 23:33:56 -0800
Zac Medico <zmedico@g.o> wrote:

> Previously, USE_EXPAND variable settings in profile make.defaults only
> supported positive incremental settings. This patch adds support for
> negative settings like PYTHON_TARGETS="-python3_3", which brings
> behavior into alignment with PMS.
>
> Notably, this patch does not change behavior for settings in
> make.conf. In make.conf, settings to USE_EXPAND variables remain
> entirely non-incremental. PMS does not govern make.conf behavior.
>
> X-Gentoo-Bug: 530222
> X-Gentoo-Url: https://bugs.gentoo.org/show_bug.cgi?id=530222
> ---
>  pym/portage/package/ebuild/config.py               |  23 ++--
>  .../tests/ebuild/test_use_expand_incremental.py    | 132
> +++++++++++++++++++++
> pym/portage/tests/resolver/ResolverPlayground.py   |  10 ++ 3 files
> changed, 155 insertions(+), 10 deletions(-) create mode 100644
> pym/portage/tests/ebuild/test_use_expand_incremental.py
>
> diff --git a/pym/portage/package/ebuild/config.py
> b/pym/portage/package/ebuild/config.py index bf39487..97c794f 100644
> --- a/pym/portage/package/ebuild/config.py
> +++ b/pym/portage/package/ebuild/config.py
> @@ -2315,6 +2315,7 @@ class config(object):
>  		# is enabled (for sub-profiles).
>  		configdict_defaults = self.configdict['defaults']
>  		if self._make_defaults is not None:
> +			defaults_use = []
>  			for i, cfg in enumerate(self._make_defaults):
>  				if not cfg:
>  					self.make_defaults_use.append("")
> @@ -2332,22 +2333,24 @@ class config(object):
>  					if v is None:
>  						continue
>  					prefix = k.lower() + '_'
> -					if k in myincrementals:
> -						for x in v.split():
> -							if x[:1] ==
> '-':
> -
> expand_use.append('-' + prefix + x[1:])
> -							else:
> -
> expand_use.append(prefix + x)
> -					else:
> -						for x in v.split():
> +					for x in v.split():
> +						if x[:1] == '-':
> +
> expand_use.append('-' + prefix + x[1:])
> +						else:
>  							expand_use.append(prefix
> + x) +
> +				defaults_use.extend(expand_use)
> +				defaults_use.extend(use.split())
> +
>  				if expand_use:
>  					expand_use.append(use)
>  					use  = ' '.join(expand_use)
>  				self.make_defaults_use.append(use)
>  			self.make_defaults_use =
> tuple(self.make_defaults_use)
> -			configdict_defaults['USE'] = ' '.join(
> -				stack_lists([x.split() for x in
> self.make_defaults_use]))
> +			# Preserve both positive and negative flags
> here, since
> +			# negative flags may later interact with
> other flags pulled
> +			# in via USE_ORDER.
> +			configdict_defaults['USE'] = '
> '.join(defaults_use) # Set to None so this code only runs once.
>  			self._make_defaults = None
>


This code looks fine.  As for the test, I know you know what you are
doing :)

LGTM


-- 
Brian Dolbec <dolsen>