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 DB3BA13837E for ; Wed, 9 Jan 2013 01:07:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 958E421C1BB; Wed, 9 Jan 2013 01:07:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0D92221C1BB for ; Wed, 9 Jan 2013 01:06:59 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2586C33DA49 for ; Wed, 9 Jan 2013 01:06:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A6719E4075 for ; Wed, 9 Jan 2013 01:06:57 +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: <1357693561.8f63eff2c75f8c64fa7ea56425a557d869a64f2f.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 8f63eff2c75f8c64fa7ea56425a557d869a64f2f X-VCS-Branch: master Date: Wed, 9 Jan 2013 01:06:57 +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: abc020f5-951f-417d-bd9f-a814dd2e4935 X-Archives-Hash: ab2e2cde62ae60d3a377f4ff14d68faa commit: 8f63eff2c75f8c64fa7ea56425a557d869a64f2f Author: Ben Kohler gmail com> AuthorDate: Wed Jan 9 01:06:01 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Jan 9 01:06:01 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8f63eff2 autounmask: show file names for suggested changes Also, advise the user to examine the proposed config changes carefully. X-Gentoo-Bug: 450960 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=450960 --- pym/_emerge/depgraph.py | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index f02ccb6..428d414 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -6578,22 +6578,22 @@ class depgraph(object): if root in unstable_keyword_msg: writemsg("\nThe following " + colorize("BAD", "keyword changes") + \ - " are necessary to proceed:\n", noiselevel=-1) + " (package.accept_keywords) are necessary to proceed:\n", noiselevel=-1) writemsg(format_msg(unstable_keyword_msg[root]), noiselevel=-1) if root in p_mask_change_msg: writemsg("\nThe following " + colorize("BAD", "mask changes") + \ - " are necessary to proceed:\n", noiselevel=-1) + " (package.unmask) are necessary to proceed:\n", noiselevel=-1) writemsg(format_msg(p_mask_change_msg[root]), noiselevel=-1) if root in use_changes_msg: writemsg("\nThe following " + colorize("BAD", "USE changes") + \ - " are necessary to proceed:\n", noiselevel=-1) + " (package.use) are necessary to proceed:\n", noiselevel=-1) writemsg(format_msg(use_changes_msg[root]), noiselevel=-1) if root in license_msg: writemsg("\nThe following " + colorize("BAD", "license changes") + \ - " are necessary to proceed:\n", noiselevel=-1) + " (package.license) are necessary to proceed:\n", noiselevel=-1) writemsg(format_msg(license_msg[root]), noiselevel=-1) protect_obj = {} @@ -6680,7 +6680,9 @@ class depgraph(object): writemsg("\nAutounmask changes successfully written. Remember to run dispatch-conf.\n", \ noiselevel=-1) elif not pretend and not autounmask_write and roots: - writemsg("\nUse --autounmask-write to write changes to config files (honoring CONFIG_PROTECT).\n", \ + writemsg("\nUse --autounmask-write to write changes to config files (honoring CONFIG_PROTECT). " + \ + "Always examine the list of proposed changes before continuing with --autounmask-write, " + \ + "as these changes may not be safe. \n", \ noiselevel=-1)