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 <gentoo-commits+bounces-350826-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QT0Kv-0000NT-GZ
for garchives@archives.gentoo.org; Sat, 04 Jun 2011 23:32:57 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BFB6E1C14E;
Sat, 4 Jun 2011 23:32:44 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 922E31C14E
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Jun 2011 23:32:44 +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 1B3B91B4036
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Jun 2011 23:32:44 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 866548050D
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Jun 2011 23:32:43 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <881f72488477cc57c4702cf699446c5dd1163a79.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/
X-VCS-Repository: proj/portage
X-VCS-Files: pym/_emerge/main.py
X-VCS-Directories: pym/_emerge/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 881f72488477cc57c4702cf699446c5dd1163a79
Date: Sat, 4 Jun 2011 23:32:43 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 247eaeb6aa32ba02e2d7eb2280d7d03f
commit: 881f72488477cc57c4702cf699446c5dd1163a79
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 4 13:18:34 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jun 4 13:18:34 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D881f7248
--ask: show group warning before pretend prompt
---
pym/_emerge/main.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 7b9ab61..21dea40 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -1732,13 +1732,13 @@ def emerge_main(args=3DNone):
if "--ask" in myopts:
writemsg_stdout("This action requires %s access...\n" % \
(access_desc,), noiselevel=3D-1)
+ if portage.secpass < 1 and not need_superuser:
+ portage_group_warning()
if userquery("Would you like to add --pretend to options?",
"--ask-enter-invalid" in myopts) =3D=3D "No":
return 1
myopts["--pretend"] =3D True
del myopts["--ask"]
- if portage.secpass < 1 and not need_superuser:
- portage_group_warning()
else:
sys.stderr.write(("emerge: %s access is required\n") \
% access_desc)