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 1QusnH-0002zi-PY for garchives@archives.gentoo.org; Sat, 20 Aug 2011 21:09:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC21921C2A5; Sat, 20 Aug 2011 21:09:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AABA721C2A5 for ; Sat, 20 Aug 2011 21:09:20 +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 1E5A21B401B for ; Sat, 20 Aug 2011 21:09:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3A9C480040 for ; Sat, 20 Aug 2011 21:09:19 +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: <305acb6d016f36312344cc44a640fdbde8f4cd33.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 305acb6d016f36312344cc44a640fdbde8f4cd33 Date: Sat, 20 Aug 2011 21:09:19 +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: 45f3be7f4f3a59a2e1a5ddedf2aea7e9 commit: 305acb6d016f36312344cc44a640fdbde8f4cd33 Author: Zac Medico gentoo org> AuthorDate: Sat Aug 20 21:09:03 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Aug 20 21:09:03 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D305acb6d ebuild(1): show merge/noauto msg only if needed --- bin/ebuild | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/ebuild b/bin/ebuild index f8b6d79..db7e5e3 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -57,10 +57,6 @@ opts, pargs =3D parser.parse_args(args=3Dsys.argv[1:]) if len(pargs) < 2: parser.error("missing required args") =20 -if "merge" in pargs: - print("Disabling noauto in features... merge disables it. (qmerge doesn= 't)") - os.environ["FEATURES"] =3D os.environ.get("FEATURES", "") + " -noauto" - os.environ["PORTAGE_CALLER"]=3D"ebuild" try: import portage @@ -257,6 +253,10 @@ if "test" in pargs: =20 tmpsettings.features.discard("fail-clean") =20 +if "merge" in pargs and "noauto" in tmpsettings.features: + print("Disabling noauto in features... merge disables it. (qmerge doesn= 't)") + tmpsettings.features.discard("noauto") + try: metadata =3D dict(zip(Package.metadata_keys, portage.db[portage.settings["ROOT"]][mytree].dbapi.aux_get(