summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-05-27 02:11:52 +0000
committerZac Medico <zmedico@gentoo.org>2006-05-27 02:11:52 +0000
commit6b24af4774abf7deaef32b66e6dd3a0077a89216 (patch)
treefbb0680e3367202f5ccf31c2be112f0555eb6bec
parentAdd noiselevel=-1 to writemsg calls for legitimate errors in merge and unmerg... (diff)
downloadportage-multirepo-6b24af4774abf7deaef32b66e6dd3a0077a89216.tar.gz
portage-multirepo-6b24af4774abf7deaef32b66e6dd3a0077a89216.tar.bz2
portage-multirepo-6b24af4774abf7deaef32b66e6dd3a0077a89216.zip
Fix emerge's userquery() so that it rejects empty responses when the enter key is pressed for bug #134466.
svn path=/main/trunk/; revision=3426
-rwxr-xr-xbin/emerge2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge
index c87151eb..bd16ad52 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -133,7 +133,7 @@ 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.upper()==key[:len(response)].upper():
+ if response and response.upper()==key[:len(response)].upper():
return key
print "Sorry, response '%s' not understood." % response,
except (EOFError, KeyboardInterrupt):