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 1R5gBc-0001fR-Fz for garchives@archives.gentoo.org; Mon, 19 Sep 2011 15:55:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6C2D21C227; Mon, 19 Sep 2011 15:54:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9663E21C227 for ; Mon, 19 Sep 2011 15:54:43 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1E44D64223 for ; Mon, 19 Sep 2011 15:54:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6189480042 for ; Mon, 19 Sep 2011 15:54:42 +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: <392cc10c0a6f608ab7a8f4a8043b58589c6ee21c.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: 392cc10c0a6f608ab7a8f4a8043b58589c6ee21c Date: Mon, 19 Sep 2011 15:54:42 +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: 782e47f5207cee1ab4118e4b77813001 commit: 392cc10c0a6f608ab7a8f4a8043b58589c6ee21c Author: Zac Medico gentoo org> AuthorDate: Mon Sep 19 15:53:55 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Sep 19 15:53:55 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D392cc10c Suggest --autounmask-keep-masks for ** keyword. --- pym/_emerge/depgraph.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index e5cc2ec..19773c2 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5767,6 +5767,7 @@ class depgraph(object): #Set of roots we have autounmask changes for. roots =3D set() =20 + masked_by_missing_keywords =3D False unstable_keyword_msg =3D {} for pkg in self._dynamic_config._needed_unstable_keywords: self._show_merge_list() @@ -5782,6 +5783,8 @@ class depgraph(object): if reason.unmask_hint and \ reason.unmask_hint.key =3D=3D 'unstable keyword': keyword =3D reason.unmask_hint.value + if keyword =3D=3D "**": + masked_by_missing_keywords =3D True =20 unstable_keyword_msg[root].append(self._get_dep_chain_as_comment(p= kg)) if autounmask_unrestricted_atoms: @@ -6033,11 +6036,11 @@ class depgraph(object): except PortageException: problems.append("!!! Failed to write '%s'\n" % file_to_write_to) =20 - if not quiet and p_mask_change_msg: + if not quiet and (p_mask_change_msg or masked_by_missing_keywords): msg =3D [ "", "NOTE: The --autounmask-keep-masks option will prevent emerge", - " from creating mask changes." + " from creating package.unmask or ** keyword changes." ] for line in msg: if line: