[gentoo-portage-dev] [PATCH] emerge: Add --autounmask-only parameter

[gentoo-portage-dev] [PATCH] emerge: Add --autounmask-only parameter

[Lucian Poston]

The --autounmask-only parameter will display autounmask messages,
perform autounmasking (in accordance with the other --autounmask-*
parameters), and exit with success (return value 0).
---
 man/emerge.1            |  6 ++++++
 pym/_emerge/actions.py  |  4 ++++
 pym/_emerge/depgraph.py |  4 ++--
 pym/_emerge/main.py     | 11 +++++++++++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index c03f044..05b2a01 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -361,6 +361,12 @@ the specified configuration file(s), or enable the
 \fBEMERGE_DEFAULT_OPTS\fR variable may be used to
 disable this option by default in \fBmake.conf\fR(5).
 .TP
+.BR "\-\-autounmask\-only [ y | n ]"
+Instead of doing any package building, just unmask
+packages and generate package.use settings as necessary
+to satisfy dependencies. This option is disabled by
+default.
+.TP
 .BR "\-\-autounmask\-unrestricted\-atoms [ y | n ]"
 If \-\-autounmask is enabled, keyword and mask changes
 using the \'=\' operator will be written. With this
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index a080ba4..5004fd1 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -327,6 +327,10 @@ def action_build(settings, trees, mtimedb,
 			display_missing_pkg_set(root_config, e.value)
 			return 1
 
+		if "--autounmask-only" in myopts:
+			mydepgraph.display_autounmask()
+			return 0
+
 		if not success:
 			mydepgraph.display_problems()
 			return 1
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 2169b00..6984f06 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -7972,7 +7972,7 @@ class depgraph(object):
 
 		return display(self, mylist, favorites, verbosity)
 
-	def _display_autounmask(self):
+	def display_autounmask(self):
 		"""
 		Display --autounmask message and optionally write it to config files
 		(using CONFIG_PROTECT). The message includes the comments and the changes.
@@ -8395,7 +8395,7 @@ class depgraph(object):
 
 		self._show_ignored_binaries()
 
-		self._display_autounmask()
+		self.display_autounmask()
 
 		for depgraph_sets in self._dynamic_config.sets.values():
 			for pset in depgraph_sets.sets.values():
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 5a8b93c..5dbafee 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -127,6 +127,7 @@ def insert_optional_args(args):
 		'--alert'                : y_or_n,
 		'--ask'                  : y_or_n,
 		'--autounmask'           : y_or_n,
+		'--autounmask-only'      : y_or_n,
 		'--autounmask-keep-masks': y_or_n,
 		'--autounmask-unrestricted-atoms' : y_or_n,
 		'--autounmask-write'     : y_or_n,
@@ -323,6 +324,11 @@ def parse_opts(tmpcmdline, silent=False):
 			"choices" : true_y_or_n
 		},
 
+		"--autounmask-only": {
+			"help"    : "only perform --autounmask",
+			"choices" : true_y_or_n
+		},
+
 		"--autounmask-unrestricted-atoms": {
 			"help"    : "write autounmask changes with >= atoms if possible",
 			"choices" : true_y_or_n
@@ -745,6 +751,11 @@ def parse_opts(tmpcmdline, silent=False):
 	if myoptions.autounmask in true_y:
 		myoptions.autounmask = True
 
+	if myoptions.autounmask_only in true_y:
+		myoptions.autounmask_only = True
+	else:
+		myoptions.autounmask_only = None
+
 	if myoptions.autounmask_unrestricted_atoms in true_y:
 		myoptions.autounmask_unrestricted_atoms = True
 
-- 
2.4.10

Re: [gentoo-portage-dev] [PATCH] emerge: Add --autounmask-only parameter

[Zac Medico]

On 12/23/2015 01:39 PM, Lucian Poston wrote:
> diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
> index a080ba4..5004fd1 100644
> --- a/pym/_emerge/actions.py
> +++ b/pym/_emerge/actions.py
> @@ -327,6 +327,10 @@ def action_build(settings, trees, mtimedb,
>  			display_missing_pkg_set(root_config, e.value)
>  			return 1
>  
> +		if "--autounmask-only" in myopts:
> +			mydepgraph.display_autounmask()
> +			return 0
> +
>  		if not success:
>  			mydepgraph.display_problems()
>  			return 1

I think we should also call display_problems just before
display_autounmask, since it could display some very useful information.
Otherwise, the patch looks good to me.
-- 
Thanks,
Zac

Re: [gentoo-portage-dev] [PATCH] emerge: Add --autounmask-only parameter

[Lucian Poston]

On Wed, Dec 23, 2015 at 5:58 PM, Zac Medico <zmedico@gentoo.org> wrote:
> I think we should also call display_problems just before
> display_autounmask, since it could display some very useful information.

display_problems calls display_autounmask. I'll send a patch v2 that
replaces the display_autounmask call with display_problems.

[gentoo-portage-dev] [PATCH v2] emerge: Add --autounmask-only parameter

[Lucian Poston]

The --autounmask-only parameter will display autounmask messages,
perform autounmasking (in accordance with the other --autounmask-*
parameters), and exit with success (return value 0).
---
 man/emerge.1           |  6 ++++++
 pym/_emerge/actions.py |  4 ++++
 pym/_emerge/main.py    | 11 +++++++++++
 3 files changed, 21 insertions(+)

diff --git a/man/emerge.1 b/man/emerge.1
index c03f044..05b2a01 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -361,6 +361,12 @@ the specified configuration file(s), or enable the
 \fBEMERGE_DEFAULT_OPTS\fR variable may be used to
 disable this option by default in \fBmake.conf\fR(5).
 .TP
+.BR "\-\-autounmask\-only [ y | n ]"
+Instead of doing any package building, just unmask
+packages and generate package.use settings as necessary
+to satisfy dependencies. This option is disabled by
+default.
+.TP
 .BR "\-\-autounmask\-unrestricted\-atoms [ y | n ]"
 If \-\-autounmask is enabled, keyword and mask changes
 using the \'=\' operator will be written. With this
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index a080ba4..1c59abd 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -327,6 +327,10 @@ def action_build(settings, trees, mtimedb,
 			display_missing_pkg_set(root_config, e.value)
 			return 1
 
+		if "--autounmask-only" in myopts:
+			mydepgraph.display_problems()
+			return 0
+
 		if not success:
 			mydepgraph.display_problems()
 			return 1
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 5a8b93c..5dbafee 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -127,6 +127,7 @@ def insert_optional_args(args):
 		'--alert'                : y_or_n,
 		'--ask'                  : y_or_n,
 		'--autounmask'           : y_or_n,
+		'--autounmask-only'      : y_or_n,
 		'--autounmask-keep-masks': y_or_n,
 		'--autounmask-unrestricted-atoms' : y_or_n,
 		'--autounmask-write'     : y_or_n,
@@ -323,6 +324,11 @@ def parse_opts(tmpcmdline, silent=False):
 			"choices" : true_y_or_n
 		},
 
+		"--autounmask-only": {
+			"help"    : "only perform --autounmask",
+			"choices" : true_y_or_n
+		},
+
 		"--autounmask-unrestricted-atoms": {
 			"help"    : "write autounmask changes with >= atoms if possible",
 			"choices" : true_y_or_n
@@ -745,6 +751,11 @@ def parse_opts(tmpcmdline, silent=False):
 	if myoptions.autounmask in true_y:
 		myoptions.autounmask = True
 
+	if myoptions.autounmask_only in true_y:
+		myoptions.autounmask_only = True
+	else:
+		myoptions.autounmask_only = None
+
 	if myoptions.autounmask_unrestricted_atoms in true_y:
 		myoptions.autounmask_unrestricted_atoms = True
 
-- 
2.4.10

Re: [gentoo-portage-dev] [PATCH v2] emerge: Add --autounmask-only parameter

[Zac Medico]

On 12/24/2015 06:38 AM, Lucian Poston wrote:
> The --autounmask-only parameter will display autounmask messages,
> perform autounmasking (in accordance with the other --autounmask-*
> parameters), and exit with success (return value 0).

Looks good now.
-- 
Thanks,
Zac

Re: [gentoo-portage-dev] [PATCH v2] emerge: Add --autounmask-only parameter

[Brian Dolbec]

On Thu, 24 Dec 2015 06:38:46 -0800
Lucian Poston <lucian.poston@gmail.com> wrote:

> The --autounmask-only parameter will display autounmask messages,
> perform autounmasking (in accordance with the other --autounmask-*
> parameters), and exit with success (return value 0).
> ---
>  man/emerge.1           |  6 ++++++
>  pym/_emerge/actions.py |  4 ++++
>  pym/_emerge/main.py    | 11 +++++++++++
>  3 files changed, 21 insertions(+)
> 
> diff --git a/man/emerge.1 b/man/emerge.1
> index c03f044..05b2a01 100644
> --- a/man/emerge.1
> +++ b/man/emerge.1
> @@ -361,6 +361,12 @@ the specified configuration file(s), or enable
> the \fBEMERGE_DEFAULT_OPTS\fR variable may be used to
>  disable this option by default in \fBmake.conf\fR(5).
>  .TP
> +.BR "\-\-autounmask\-only [ y | n ]"
> +Instead of doing any package building, just unmask
> +packages and generate package.use settings as necessary
> +to satisfy dependencies. This option is disabled by
> +default.
> +.TP
>  .BR "\-\-autounmask\-unrestricted\-atoms [ y | n ]"
>  If \-\-autounmask is enabled, keyword and mask changes
>  using the \'=\' operator will be written. With this
> diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
> index a080ba4..1c59abd 100644
> --- a/pym/_emerge/actions.py
> +++ b/pym/_emerge/actions.py
> @@ -327,6 +327,10 @@ def action_build(settings, trees, mtimedb,
>  			display_missing_pkg_set(root_config, e.value)
>  			return 1
>  
> +		if "--autounmask-only" in myopts:
> +			mydepgraph.display_problems()
> +			return 0
> +
>  		if not success:
>  			mydepgraph.display_problems()
>  			return 1
> diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
> index 5a8b93c..5dbafee 100644
> --- a/pym/_emerge/main.py
> +++ b/pym/_emerge/main.py
> @@ -127,6 +127,7 @@ def insert_optional_args(args):
>  		'--alert'                : y_or_n,
>  		'--ask'                  : y_or_n,
>  		'--autounmask'           : y_or_n,
> +		'--autounmask-only'      : y_or_n,
>  		'--autounmask-keep-masks': y_or_n,
>  		'--autounmask-unrestricted-atoms' : y_or_n,
>  		'--autounmask-write'     : y_or_n,
> @@ -323,6 +324,11 @@ def parse_opts(tmpcmdline, silent=False):
>  			"choices" : true_y_or_n
>  		},
>  
> +		"--autounmask-only": {
> +			"help"    : "only perform --autounmask",
> +			"choices" : true_y_or_n
> +		},
> +
>  		"--autounmask-unrestricted-atoms": {
>  			"help"    : "write autounmask changes with
> >= atoms if possible", "choices" : true_y_or_n
> @@ -745,6 +751,11 @@ def parse_opts(tmpcmdline, silent=False):
>  	if myoptions.autounmask in true_y:
>  		myoptions.autounmask = True
>  
> +	if myoptions.autounmask_only in true_y:
> +		myoptions.autounmask_only = True
> +	else:
> +		myoptions.autounmask_only = None
> +
>  	if myoptions.autounmask_unrestricted_atoms in true_y:
>  		myoptions.autounmask_unrestricted_atoms = True
>  

yeah, this will be a good complement toe the autounmask options

-- 
Brian Dolbec <dolsen>

Re: [gentoo-portage-dev] [PATCH v2] emerge: Add --autounmask-only parameter

[Alexander Berntsen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

LGTM. Thanks for this!
- -- 
Alexander
bernalex@gentoo.org
https://secure.plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCgAGBQJWgmQ1AAoJENQqWdRUGk8B3qwP/itaogbVFoyxXqBHQT1aA0/X
WbKMyvBgpRpcfTK6GS4NEVq4AeVorUOPHFcHQFBtLJWyzr/D7CYRf11KVl4AyH0y
jSNKVZ+exvrDwCiLbim92yHh66DxyRK/kKRhrhdSb8zwnAD0YyfPGdVkAjLsZ/A2
81itvPHT7WSA0Zf9hLnk5xRq0Wnb60ZoMOBf/4q+tW07lzdQYIS2K/hnIDa/K+Zn
03sZ1ZZgeY5nzpelQNS4YRKjhrZxQmNF6WdbDyYQ/9p9HDsvSSHYjQA0ytzFY5C+
0iUhMTWR4kq0HW76057J5mOgeoC6FnHHGZIJ4kgmwX+kO70kN+uJ7Px8xKvx9vIz
eA8ncFc8uAJ+OIrsi9ehyDv6Ae6Sb3DTzdoIUrG3GEL6gCtCixEDeqBKyKfzCu6n
SpN3ykIBH1UdLpOxXRPayXq0V/IAl0k4Q5Xz+qZsmfVxizMtp55y0tgI327eClQn
vwKEGtMQplEc8Zc/JXmp2UfWDekbh8CIeEs7FHRnd3V4aYXvMlZsMEO0OESIFXl6
eIVUHSP7hjKbvuCiMQD4U2GEgTRlWqyetkre3SFzlQeUqBJ77ACs6r4xpjJXkMAi
W+tsIejIbBgiobj0+UbTjgUlfOZWGolZBCL/cSeM5+B/R6KzE0p8VnX7wptKHQmi
ekwfSL50Qwh7QgxwRWld
=qG5C
-----END PGP SIGNATURE-----

Re: [gentoo-portage-dev] [PATCH v2] emerge: Add --autounmask-only parameter

[Alexander Berntsen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

I just remembered -- did I not ask you to add a bug for this? Did you?
If so, please add it to the commit message -- see the other messages
for how. Just add (bug nnnn) to the header, and X-Gentoo-Bug and
X-Gentoo-Bug-url to the message.

If you did not add a bug, let me know.

I will push this once you get me a v3 with an updated commit message,
or a NACK on the bug add.
- -- 
Alexander
bernalex@gentoo.org
https://secure.plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCgAGBQJWgmTmAAoJENQqWdRUGk8BaFUP/2NpVkZjLMVnSyw/1On/ek3/
wR6x4jHIrqdnBNUmdQp8OtchlDyffMlzLmuCM1X1TsMlHN9gn9tmzK0VmqLeSjC5
0lG5osLIjdLM4Ge4h3wYtjOTdnUvJpJiFOvPGWi0ptwm5TYwM/H5LnX/yqDe+cU9
7BYj8zzJ8XJFiIrkBqE/FQUqNLNHz2pDt1qwqSq7xX2Z+ojpTXAm+Z5Z9EjigEuh
5jpVQgjP8NreoQUJmXxV3HxGYhsfdjMKcuaMqF5ntXwUNUzP5xerbi9IjWQvX6Mo
sGL0U81Ks5Adttp6ex7oasEGstAqVw469PuFmHVpRD9zJhwzCAJSedp1uWXWxEGR
t82DlXKk+L4T5bZuIaKEcGkiNhfy8tBPU5s3Z+HSk/JG3w5dIwI/iTU3ajgw7KGB
sgv9Q/2G/PhEBIoYXJzEDdRPx17LtOrrStcuFqvKreTBVUneOUMr4HAP1RnvHYMF
NRgZBAy6E5B2JgFBWINgkuRjYwvppP9N2dtzPm2pH7MC3+tsn0qGlb1LAdAOWKGa
rcABA9viK8g2YcHSPcvb+8QlU8kubkH0NJqw0LO70RNSZh54NmQ1rrgIkVi1ZUmZ
BvNUrP14e+SrzK380kYYz0gtG2loFC5APk2HnGP2iNOsqaNKwghzdMg8LL6MhAaN
q9utXhEr8upRauKFRSZQ
=atND
-----END PGP SIGNATURE-----

[gentoo-portage-dev] [PATCH v3] emerge: Add --autounmask-only parameter (bug 570672)

[Lucian Poston]

The --autounmask-only parameter will display autounmask messages,
perform autounmasking (in accordance with the other --autounmask-*
parameters), and exit with success (return value 0).

X-Gentoo-Bug: 570672
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=570672
---
 man/emerge.1           |  6 ++++++
 pym/_emerge/actions.py |  4 ++++
 pym/_emerge/main.py    | 11 +++++++++++
 3 files changed, 21 insertions(+)

diff --git a/man/emerge.1 b/man/emerge.1
index c03f044..05b2a01 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -361,6 +361,12 @@ the specified configuration file(s), or enable the
 \fBEMERGE_DEFAULT_OPTS\fR variable may be used to
 disable this option by default in \fBmake.conf\fR(5).
 .TP
+.BR "\-\-autounmask\-only [ y | n ]"
+Instead of doing any package building, just unmask
+packages and generate package.use settings as necessary
+to satisfy dependencies. This option is disabled by
+default.
+.TP
 .BR "\-\-autounmask\-unrestricted\-atoms [ y | n ]"
 If \-\-autounmask is enabled, keyword and mask changes
 using the \'=\' operator will be written. With this
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index a080ba4..1c59abd 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -327,6 +327,10 @@ def action_build(settings, trees, mtimedb,
 			display_missing_pkg_set(root_config, e.value)
 			return 1
 
+		if "--autounmask-only" in myopts:
+			mydepgraph.display_problems()
+			return 0
+
 		if not success:
 			mydepgraph.display_problems()
 			return 1
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 5a8b93c..5dbafee 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -127,6 +127,7 @@ def insert_optional_args(args):
 		'--alert'                : y_or_n,
 		'--ask'                  : y_or_n,
 		'--autounmask'           : y_or_n,
+		'--autounmask-only'      : y_or_n,
 		'--autounmask-keep-masks': y_or_n,
 		'--autounmask-unrestricted-atoms' : y_or_n,
 		'--autounmask-write'     : y_or_n,
@@ -323,6 +324,11 @@ def parse_opts(tmpcmdline, silent=False):
 			"choices" : true_y_or_n
 		},
 
+		"--autounmask-only": {
+			"help"    : "only perform --autounmask",
+			"choices" : true_y_or_n
+		},
+
 		"--autounmask-unrestricted-atoms": {
 			"help"    : "write autounmask changes with >= atoms if possible",
 			"choices" : true_y_or_n
@@ -745,6 +751,11 @@ def parse_opts(tmpcmdline, silent=False):
 	if myoptions.autounmask in true_y:
 		myoptions.autounmask = True
 
+	if myoptions.autounmask_only in true_y:
+		myoptions.autounmask_only = True
+	else:
+		myoptions.autounmask_only = None
+
 	if myoptions.autounmask_unrestricted_atoms in true_y:
 		myoptions.autounmask_unrestricted_atoms = True
 
-- 
2.4.10

[gentoo-portage-dev] Re: [PATCH v3] emerge: Add --autounmask-only parameter (bug 570672)

[Alexander Berntsen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Ta! After testing it a bit, I pushed it as
51f100e42753d6ffd3a24dfcb2ff8af0aa34966e.

I hope to see more patches from you! :-]

- -- 
Alexander
bernalex@gentoo.org
https://secure.plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCgAGBQJWiku5AAoJENQqWdRUGk8BWJUQANaYBTWRy1FTqSsBdJDlMEzr
RlLhQYtTucNC7WOjxhZXjRLqUqalNZ99G9dOMmFnMrf8GVd8He3xbNmUCCPDQtWL
3mIRwXq3yD7+y2mMm5iL+vEJw7J2XcXLG58LhJdoLvKrMmkUkaZ/4JYgWnooevPF
ZMnIocUv39cD9IBQGt0iBjM+sK62wfMEwHJiO+x6c9x2ljs0Tckb8mxr/ScSug2f
tVpQQCqlNNxtEHnQHjjBUjtqyJ09HyvUB90aY52Bcw6smF+fvg+CXs3GuKIzCrPD
yc9VZssiDRuezU8096S8hGMuYxWHydTuQQOg4cek8TK8VNV6Ro/9AFQNxXbt/9vC
tMsCzZSc5WiiExR/wqhfcje6BHKIXPjH5cTHv7YB3Kf42+JvC5hXdkRTFG9TT0Y4
5pJf841r/M9AFRk8ETeutPLjRqhBYR4BimqTjWywp3j3iI7PpUGm5Pm7htoY4X2Z
iEC4PoUaIkxneTXghl6P16xJwhy/w0dfTX768Bu3rvxiyr03VoVcJUWjBqtC2eLp
Cki8K/rh/tiFzUWULRqg9btS78jO+PmSnm/q/AfgZ6J13BgLNmLEuW/+tApoVhd7
feX8Mnrhqw0hB1lkqW9tw3h0sQsgCNUpxK7KUWczlrKV1wTfrMckAuCksb0cGr9o
9RfLxDqpf4Qr/hcAgRKa
=2kcS
-----END PGP SIGNATURE-----