Re: [gentoo-portage-dev] [PATCHv4] emerge: --autounmask-write if --ask (bug 481578)

[Brian Dolbec]

On Mon, 22 Sep 2014 13:51:21 +0200
Alexander Berntsen <bernalex@g.o> wrote:

> From: Alexander Berntsen <alexander@××××××.net>
>
> Signed-off-by: Alexander Berntsen <bernalex@g.o>
> ---
> Update manpage header, as pointed out by Arfrever.
>
>  man/emerge.1            | 5 +++--
>  pym/_emerge/depgraph.py | 6 ++++--
>  2 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/man/emerge.1 b/man/emerge.1
> index e32bb43..a2cb3f6 100644
> --- a/man/emerge.1
> +++ b/man/emerge.1
> @@ -1,4 +1,4 @@
> -.TH "EMERGE" "1" "Mar 2014" "Portage VERSION" "Portage"
> +.TH "EMERGE" "1" "Sep 2014" "Portage VERSION" "Portage"
>  .SH "NAME"
>  emerge \- Command\-line interface to the Portage system
>  .SH "SYNOPSIS"
> @@ -367,7 +367,8 @@ to config files, respecting \fBCONFIG_PROTECT\fR
> and \fB\-\-ask\fR. If the corresponding package.* is a file, the
> changes are appended to it, if it is a directory, changes are written
> to the lexicographically last file. This way it is always ensured
> that the new changes take -precedence over existing changes.
> +precedence over existing changes. This option is automatically
> enabled with +\-\-ask.
>  .TP
>  .BR \-\-backtrack=COUNT
>  Specifies an integer number of times to backtrack if
> diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
> index 6332733..9f88df3 100644
> --- a/pym/_emerge/depgraph.py
> +++ b/pym/_emerge/depgraph.py
> @@ -7514,12 +7514,14 @@ class depgraph(object):
>  		(using CONFIG_PROTECT). The message includes the
> comments and the changes. """
>
> -		autounmask_write =
> self._frozen_config.myopts.get("--autounmask-write", "n") == True
> +		ask = "--ask" in self._frozen_config.myopts
> +		autounmask_write = \
> +
> self._frozen_config.myopts.get("--autounmask-write",
> +
> ask) is True autounmask_unrestricted_atoms = \
>  			self._frozen_config.myopts.get("--autounmask-unrestricted-atoms",
> "n") == True quiet = "--quiet" in self._frozen_config.myopts
>  		pretend = "--pretend" in self._frozen_config.myopts
> -		ask = "--ask" in self._frozen_config.myopts
>  		enter_invalid = '--ask-enter-invalid' in
> self._frozen_config.myopts
>  		def check_if_latest(pkg):

committed, released in 2.2.14_rc1

-- 
Brian Dolbec <dolsen>