From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 4 Jun 2011 13:18:34 +0000 (-0700)
Subject: --ask: show group warning before pretend prompt
X-Git-Tag: v2.2.0_alpha38~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=881f72488477cc57c4702cf699446c5dd1163a79;p=portage.git

--ask: show group warning before pretend prompt
---

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 7b9ab6152..21dea4035 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -1732,13 +1732,13 @@ def emerge_main(args=None):
 				if "--ask" in myopts:
 					writemsg_stdout("This action requires %s access...\n" % \
 						(access_desc,), noiselevel=-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) == "No":
 						return 1
 					myopts["--pretend"] = 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)