From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B60F313838B for ; Mon, 29 Sep 2014 22:12:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 91B7DE0944; Mon, 29 Sep 2014 22:12:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2DE7BE0944 for ; Mon, 29 Sep 2014 22:12:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C716B33FAD7 for ; Mon, 29 Sep 2014 22:12:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B82B5D5 for ; Mon, 29 Sep 2014 22:12:36 +0000 (UTC) From: "Alexander Berntsen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexander Berntsen" Message-ID: <1412028729.7d605312d48ae5f7755f640ef78c97b424399bd0.bernalex@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/, man/ X-VCS-Repository: proj/portage X-VCS-Files: man/emerge.1 pym/_emerge/actions.py pym/_emerge/main.py X-VCS-Directories: pym/_emerge/ man/ X-VCS-Committer: bernalex X-VCS-Committer-Name: Alexander Berntsen X-VCS-Revision: 7d605312d48ae5f7755f640ef78c97b424399bd0 X-VCS-Branch: master Date: Mon, 29 Sep 2014 22:12:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 012f1298-3c2c-46db-81d3-c982a92de2e9 X-Archives-Hash: 9f411605f488f8d93907d76343fdf3bb commit: 7d605312d48ae5f7755f640ef78c97b424399bd0 Author: Alexander Berntsen gentoo org> AuthorDate: Mon Sep 29 10:20:03 2014 +0000 Commit: Alexander Berntsen gentoo org> CommitDate: Mon Sep 29 22:12:09 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7d605312 Implement --read-news (off by default) Turn off news-reading by default when --ask, and instead make it an option --read-news. Apparently making --ask a bit more interactive was "goddamn stupid" and ruined the lives of several Gentoo developers. Props to Michał who predicted this all along. ACKed-by: Brian Dolbec gentoo.org> Signed-off-by: Alexander Berntsen gentoo.org> --- man/emerge.1 | 3 +++ pym/_emerge/actions.py | 2 +- pym/_emerge/main.py | 13 +++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/man/emerge.1 b/man/emerge.1 index a2cb3f6..2264b58 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -716,6 +716,9 @@ Disable the warning message that's shown prior to to be set in the \fBmake.conf\fR(5) \fBEMERGE_DEFAULT_OPTS\fR variable. .TP +.BR "\-\-read-news [ y | n ]" +Offer to read news via eselect if there are unread news. +.TP .BR "\-\-rebuild\-if\-new\-slot [ y | n ]" Automatically rebuild or reinstall packages when slot/sub\-slot := operator dependencies can be satisfied by a newer slot, so that diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 9036810..4e8b83b 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -4064,7 +4064,7 @@ def run_action(emerge_config): uq = UserQuery(emerge_config.opts) if display_news_notification(emerge_config.target_config, emerge_config.opts) \ - and "--ask" in emerge_config.opts \ + and "--read-news" in emerge_config.opts \ and uq.query("Would you like to read the news items while " \ "calculating dependencies?", '--ask-enter-invalid' in emerge_config.opts) == "Yes": diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 52aa9c5..3883f72 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -146,6 +146,7 @@ def insert_optional_args(args): '--quiet' : y_or_n, '--quiet-build' : y_or_n, '--quiet-fail' : y_or_n, + '--read-news' : y_or_n, '--rebuild-if-new-slot': y_or_n, '--rebuild-if-new-rev' : y_or_n, '--rebuild-if-new-ver' : y_or_n, @@ -557,6 +558,12 @@ def parse_opts(tmpcmdline, silent=False): "choices" : true_y_or_n, }, + "--read-news": { + "help" : "offer to read unread news via eselect", + "choices" : true_y_or_n + }, + + "--rebuild-if-new-slot": { "help" : ("Automatically rebuild or reinstall packages when slot/sub-slot := " "operator dependencies can be satisfied by a newer slot, so that " @@ -803,6 +810,12 @@ def parse_opts(tmpcmdline, silent=False): if myoptions.quiet_fail in true_y: myoptions.quiet_fail = 'y' + if myoptions.read_news in true_y: + myoptions.read_news = True + else: + myoptions.read_news = None + + if myoptions.rebuild_if_new_slot in true_y: myoptions.rebuild_if_new_slot = 'y'