From 881f72488477cc57c4702cf699446c5dd1163a79 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 4 Jun 2011 06:18:34 -0700 Subject: --ask: show group warning before pretend prompt --- pym/_emerge/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pym') 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) -- cgit v1.2.3-1-g7c22