diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-03-24 11:15:47 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-03-24 11:15:47 -0700 |
| commit | 39911a4fc3859ae528dfe541ae9d9119291ae0e2 (patch) | |
| tree | ba072a3dc9ebcd9d9c4787f4c117e4d22e3a82c8 /pym/_emerge/help.py | |
| parent | 20fff13645e50ec68c5a56c064e66e11aad72256 (diff) | |
| download | portage-39911a4fc3859ae528dfe541ae9d9119291ae0e2.tar.gz portage-39911a4fc3859ae528dfe541ae9d9119291ae0e2.tar.bz2 portage-39911a4fc3859ae528dfe541ae9d9119291ae0e2.zip | |
emerge: support [ y | n ] for --ask
This allows --ask to be enabled via EMERGE_DEFAULT_OPTS, and then
temporarily disabled via the command-line. This may be useful for
programs that call emerge non-interactively, as in bug #360233.
Diffstat (limited to 'pym/_emerge/help.py')
| -rw-r--r-- | pym/_emerge/help.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index 020bc4206..a120f54d3 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -280,7 +280,9 @@ def help(myopts, havecolor=1): print(" With this option, output such as USE=\"dar -bar -foo\" will instead") print(" be displayed as USE=\"-bar dar -foo\"") print() - print(" "+green("--ask")+" ("+green("-a")+" short option)") + print(" " + green("--ask") + \ + " [ %s | %s ] (%s short option)" % \ + (turquoise("y"), turquoise("n"), green("-a"))) desc = "Before performing the action, display what will take place (server info for " + \ "--sync, --pretend output for merge, and so forth), then ask " + \ "whether to proceed with the action or abort. Using --ask is more " + \ |