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

["Xen patchbot-3.4-testing" <patchbot-3.4-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1250753424 -3600
# Node ID 7a57911ff09efb2b2e5fe7811e0495adc5884a29
# Parent  3fc731e42b63f14ef0be1a972113dd19834f0d99
pygrub: Revert 19322:3118041f2259, as it breaks timeout=0 behaviour

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
xen-unstable changeset:   20090:3509276d8ad6
xen-unstable date:        Thu Aug 20 08:23:33 2009 +0100
---
 tools/pygrub/src/pygrub |    6 +-----
 1 files changed, 1 insertion(+), 5 deletions(-)

diff -r 3fc731e42b63 -r 7a57911ff09e tools/pygrub/src/pygrub
--- a/tools/pygrub/src/pygrub   Thu Aug 20 08:29:54 2009 +0100
+++ b/tools/pygrub/src/pygrub   Thu Aug 20 08:30:24 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