From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QSd0a-0005xk-LB for garchives@archives.gentoo.org; Fri, 03 Jun 2011 22:38:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 352581C002; Fri, 3 Jun 2011 22:38:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F0F5D1C002 for ; Fri, 3 Jun 2011 22:38:16 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 533C91B4034 for ; Fri, 3 Jun 2011 22:38:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BB37280506 for ; Fri, 3 Jun 2011 22:38:15 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: 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: d21811eec723ffc6acb1daf0e2d7b19bf3af6978 Date: Fri, 3 Jun 2011 22:38:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: d032d8063c36ed78923dbc4caa3a56c0 commit: d21811eec723ffc6acb1daf0e2d7b19bf3af6978 Author: Zac Medico gentoo org> AuthorDate: Fri Jun 3 22:27:24 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Jun 3 22:27:24 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dd21811ee --autounmask: show note suggesting how to disable Now that --autounmask is enabled by default, people are dealing with local masks that trigger unsatisfied dependencies often complain about --autounmask behavior being inappropriate for their situation. Therefore, show a helpful note when the autounmask code is triggered and --quiet is not enabled: NOTE: This --autounmask behavior can be disabled by setting EMERGE_DEFAULT_OPTS=3D"--autounmask=3Dn" in make.conf. --- pym/_emerge/depgraph.py | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index b60fd19..0b4be4f 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5587,6 +5587,7 @@ class depgraph(object): """ =20 autounmask_write =3D self._frozen_config.myopts.get("--autounmask-writ= e", "n") =3D=3D True + quiet =3D "--quiet" in self._frozen_config.myopts pretend =3D "--pretend" in self._frozen_config.myopts ask =3D "--ask" in self._frozen_config.myopts enter_invalid =3D '--ask-enter-invalid' in self._frozen_config.myopts @@ -5857,6 +5858,21 @@ class depgraph(object): except PortageException: problems.append("!!! Failed to write '%s'\n" % file_to_write_to) =20 + if not quiet and \ + (unstable_keyword_msg or \ + p_mask_change_msg or \ + use_changes_msg or \ + license_msg): + msg =3D [ + "", + "NOTE: This --autounmask behavior can be disabled by setting", + " EMERGE_DEFAULT_OPTS=3D\"--autounmask=3Dn\" in make.conf." + ] + for line in msg: + if line: + line =3D colorize("INFORM", line) + writemsg_stdout(line + "\n", noiselevel=3D-1) + if ask and write_to_file and file_to_write_to: prompt =3D "\nWould you like to add these " + \ "changes to your config files?"