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 1R5eyh-0002Vw-1t for garchives@archives.gentoo.org; Mon, 19 Sep 2011 14:37:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6AE9A21C1B3; Mon, 19 Sep 2011 14:37:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3D2CF21C1C7 for ; Mon, 19 Sep 2011 14:37:33 +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 C21771B4028 for ; Mon, 19 Sep 2011 14:37:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 21A2280048 for ; Mon, 19 Sep 2011 14:37:32 +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: cfae195364f3cc9700f34eef031933ff701d029d Date: Mon, 19 Sep 2011 14:37:32 +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: 186ca6ccb95ad40ada618e63f0092b7b commit: cfae195364f3cc9700f34eef031933ff701d029d Author: Sebastian Luther gmx de> AuthorDate: Mon Sep 19 11:05:23 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Sep 19 14:32:32 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dcfae1953 Suggest --autounmask-keep-masks instead of --autounmask=3Dn Currently emerge suggests --autounmask=3Dn if any configuration change is proposed. With this patch it will print a suggestion only for mask changes, as these are the changes people complain most about. It will suggest --autounmask-keep-masks in this case. --- pym/_emerge/depgraph.py | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 52d4545..e5cc2ec 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -6033,15 +6033,11 @@ 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): + if not quiet and p_mask_change_msg: msg =3D [ "", - "NOTE: This --autounmask behavior can be disabled by setting", - " EMERGE_DEFAULT_OPTS=3D\"--autounmask=3Dn\" in make.conf." + "NOTE: The --autounmask-keep-masks option will prevent emerge", + " from creating mask changes." ] for line in msg: if line: