diff options
author | Zac Medico <zmedico@gentoo.org> | 2006-05-28 23:27:35 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2006-05-28 23:27:35 +0000 |
commit | ccdc4071dfc9907634fd8a08dd0a3c8bf71a62f7 (patch) | |
tree | fe3724bd87fcdf4fb262dbf171570315fcc1435f /bin | |
parent | 0d04fd8249ea36d4b8153fa4c33c3dfb2977146c (diff) | |
download | portage-ccdc4071dfc9907634fd8a08dd0a3c8bf71a62f7.tar.gz portage-ccdc4071dfc9907634fd8a08dd0a3c8bf71a62f7.tar.bz2 portage-ccdc4071dfc9907634fd8a08dd0a3c8bf71a62f7.zip |
Revert patch for r3426 for bug 134466 and add warnings to docs.
svn path=/main/trunk/; revision=3437
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/emerge | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index 49f68a411..2b2a72fcb 100755 --- a/bin/emerge +++ b/bin/emerge @@ -109,7 +109,8 @@ def normpath(mystr): def userquery(prompt, responses=None, colours=None): """Displays a prompt and a set of responses, then waits for a response which is checked against the responses and the first to match is - returned. + returned. An empty response will match the first value in responses. The + input buffer is *not* cleared prior to the prompt! prompt: a String. responses: a List of Strings. @@ -133,7 +134,8 @@ def userquery(prompt, responses=None, colours=None): while True: response=raw_input("["+string.join([colours[i](responses[i]) for i in range(len(responses))],"/")+"] ") for key in responses: - if response and response.upper()==key[:len(response)].upper(): + # An empty response will match the first value in responses. + if response.upper()==key[:len(response)].upper(): return key print "Sorry, response '%s' not understood." % response, except (EOFError, KeyboardInterrupt): |