From 9c03d52526f58eb53c9e76785352fbb53413898d Mon Sep 17 00:00:00 2001 From: Alexander Berntsen Date: Tue, 1 Oct 2013 12:10:14 +0200 Subject: [PATCH 3/3] emerge: Make --autounmask=y if --ask=y --- man/emerge.1 | 9 +++++---- pym/_emerge/depgraph.py | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/man/emerge.1 b/man/emerge.1 index e23d1b4..52f8ed7 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -331,10 +331,11 @@ Write required unmask changes to the relevant config files, respecting \fBCONFIG_PROTECT\fR. If invoked together with \fB\-\-ask\fR, emerge will prompt you to write the changes. If invoked along with \fB\-\-pretend\fR, emerge will merely output the required changes and not make any of them by -itself. 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. +itself. This option is enabled by default if are running emerge with +\fB\-\-ask\fR or \fB\-\-pretend\fR, and disabled by default elsewise. 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. .TP .BR "\-\-autounmask\-unrestricted\-atoms [ y | n ]" Keyword and mask changes using the \'=\' operator will be written. With this diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 5b4b723..e8b680d 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -6806,12 +6806,13 @@ class depgraph(object): (using CONFIG_PROTECT). The message includes the comments and the changes. """ - autounmask_write = self._frozen_config.myopts.get("--autounmask", "n") == True + ask = "--ask" in self._frozen_config.myopts + autounmask_write = ask or \ + self._frozen_config.myopts.get("--autounmask", "n") == 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): -- 1.8.1.5