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 70C60138825 for ; Tue, 21 Oct 2014 23:21:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 160DEE0845; Tue, 21 Oct 2014 23:21:42 +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 9FA19E0845 for ; Tue, 21 Oct 2014 23:21:41 +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 E73EB340544 for ; Tue, 21 Oct 2014 23:21:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9522586DC for ; Tue, 21 Oct 2014 23:21:38 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1413933674.8a9f865ae433d8b7609bd1754e0328d88d2a2bda.zmedico@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 X-VCS-Directories: pym/_emerge/ man/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 8a9f865ae433d8b7609bd1754e0328d88d2a2bda X-VCS-Branch: master Date: Tue, 21 Oct 2014 23:21:38 +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: 15767a0d-735a-4b12-8eb5-20ac04a70568 X-Archives-Hash: 6ca696e7b6ee17fde91533ad564b3d72 commit: 8a9f865ae433d8b7609bd1754e0328d88d2a2bda Author: Zac Medico gentoo org> AuthorDate: Mon Oct 20 20:04:28 2014 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Oct 21 23:21:14 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8a9f865a emerge --read-news: prompt only if --ask This fixes any conditional logic that applies to --ask so that it also applies to --read-news. For example, emerge will bail out automatically if --ask is enabled and stdin is not a tty. X-Gentoo-Bug: 517310 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=517310 --- man/emerge.1 | 5 +++-- pym/_emerge/actions.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/man/emerge.1 b/man/emerge.1 index 9873ba9..12e8b45 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -716,8 +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. +.BR "\-\-read\-news [ y | n ]" +Offer to read news via eselect if there are unread news. This option +has no effect unless \fB\-\-ask\fR is enabled. .TP .BR "\-\-rebuild\-if\-new\-slot [ y | n ]" Automatically rebuild or reinstall packages when slot/sub\-slot := diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 4e8b83b..ee57cec 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -4064,6 +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?",