diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-08-20 08:23:33 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-08-20 08:23:33 +0100 |
| commit | be7c3e95bc3b32ff491a2929b5a2df22393c0c4a (patch) | |
| tree | 7bba59796d7918d99f797245e9d8bec426f8557d /tools/pygrub | |
| parent | 361c9826391a8f512e5ca3211feae927f8ee5cce (diff) | |
| download | xen-be7c3e95bc3b32ff491a2929b5a2df22393c0c4a.tar.gz xen-be7c3e95bc3b32ff491a2929b5a2df22393c0c4a.tar.bz2 xen-be7c3e95bc3b32ff491a2929b5a2df22393c0c4a.zip | |
pygrub: Revert 19322:3118041f2259, as it breaks timeout=0 behaviour
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'tools/pygrub')
| -rw-r--r-- | tools/pygrub/src/pygrub | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index ac20aace67..93e157c4b7 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -443,11 +443,7 @@ class Grub: # Timed out waiting for a keypress if mytime != -1: mytime += 1 - # curses.timeout() does not work properly on Solaris - # So we may come here even after a key has been pressed. - # Check both timeout and mytime to avoid exiting - # when we shouldn't. - if timeout != -1 and mytime >= int(timeout): + if mytime >= int(timeout): self.isdone = True break else: |