[Xen-changelog] [xen-unstable] pygrub: Revert 19322:3118041f2259, as it breaks timeout=0 behaviour

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1250753013 -3600
# Node ID 3509276d8ad697d3d32c04316bf2ebbc7ccf7ffc
# Parent  a3ae60f8b546a142c8b1d4fee67cc2394e6dabc9
pygrub: Revert 19322:3118041f2259, as it breaks timeout=0 behaviour

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/pygrub/src/pygrub |    6 +-----
 1 files changed, 1 insertion(+), 5 deletions(-)

diff -r a3ae60f8b546 -r 3509276d8ad6 tools/pygrub/src/pygrub
--- a/tools/pygrub/src/pygrub   Wed Aug 19 17:00:26 2009 +0100
+++ b/tools/pygrub/src/pygrub   Thu Aug 20 08:23:33 2009 +0100
@@ -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:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog