summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-06-04 06:18:34 -0700
committerZac Medico <zmedico@gentoo.org>2011-06-04 06:18:34 -0700
commit881f72488477cc57c4702cf699446c5dd1163a79 (patch)
tree221c489ab9a9ef807d875bc609dc38a1a8540a01
parent1ba2da580203f52d12871aee87f2fdbcb87f8128 (diff)
downloadportage-881f72488477cc57c4702cf699446c5dd1163a79.tar.gz
portage-881f72488477cc57c4702cf699446c5dd1163a79.tar.bz2
portage-881f72488477cc57c4702cf699446c5dd1163a79.zip
--ask: show group warning before pretend prompt
-rw-r--r--pym/_emerge/main.py4
1 files changed, 2 insertions, 2 deletions
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)