For bug #182021, use active voice when notifying the user that superuser access is...

svn path=/main/branches/2.1.2/; revision=6855

diff --git a/bin/emerge b/bin/emerge
index 41d0220d5ea4fc426b75fc70111bc9aa1c79d81b..cec8977f2be2bd824dba705ba0df065633760d79 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -5468,12 +5468,12 @@ def emerge_main():
                                if "--ask" in myopts:
                                        myopts["--pretend"] = True
                                        del myopts["--ask"]
-                                       print ("%s access would be required... " + \
+                                       print ("%s access is required... " + \
                                                "adding --pretend to options.\n") % access_desc
                                        if portage.secpass < 1 and not need_superuser:
                                                portage_group_warning()
                                else:
-                                       sys.stderr.write(("emerge: %s access would be " + \
+                                       sys.stderr.write(("emerge: %s access is " + \
                                                "required.\n\n") % access_desc)
                                        if portage.secpass < 1 and not need_superuser:
                                                portage_group_warning()