debuggers.hg

changeset 3359:fb44ce115c8e

bitkeeper revision 1.1159.1.501 (41c9d4918cIsDiTOnDU2eRZj1sj1bA)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Wed Dec 22 20:09:53 2004 +0000 (2004-12-22)
parents feb29654f4d9 57a1ea255d3c
children ddc28d82a044
files tools/misc/xencons tools/python/xen/util/console_client.py
line diff
     1.1 --- a/tools/misc/xencons	Wed Dec 22 19:45:26 2004 +0000
     1.2 +++ b/tools/misc/xencons	Wed Dec 22 20:09:53 2004 +0000
     1.3 @@ -30,11 +30,12 @@ def __recv_from_sock(sock):
     1.4          except socket.error, error:
     1.5              if error[0] != errno.EINTR:
     1.6                  raise
     1.7 -        try:
     1.8 -            os.write(1, data)
     1.9 -        except os.error, error:
    1.10 -            if error[0] != errno.EINTR:
    1.11 -                raise
    1.12 +        else:
    1.13 +            try:
    1.14 +                os.write(1, data)
    1.15 +            except os.error, error:
    1.16 +                if error[0] != errno.EINTR:
    1.17 +                    raise
    1.18      os.wait()
    1.19  
    1.20  def __send_to_sock(sock):
     2.1 --- a/tools/python/xen/util/console_client.py	Wed Dec 22 19:45:26 2004 +0000
     2.2 +++ b/tools/python/xen/util/console_client.py	Wed Dec 22 20:09:53 2004 +0000
     2.3 @@ -30,11 +30,12 @@ def __recv_from_sock(sock):
     2.4          except socket.error, error:
     2.5              if error[0] != errno.EINTR:
     2.6                  raise
     2.7 -        try:
     2.8 -            os.write(1, data)
     2.9 -        except os.error, error:
    2.10 -            if error[0] != errno.EINTR:
    2.11 -                raise
    2.12 +        else:
    2.13 +            try:
    2.14 +                os.write(1, data)
    2.15 +            except os.error, error:
    2.16 +                if error[0] != errno.EINTR:
    2.17 +                    raise
    2.18      os.wait()
    2.19  
    2.20  def __send_to_sock(sock):