[jhbuild] Fix autobuild after commit 8ae2eaf20517c57ebf1bb437d3abb3dcb1a6fa27

[Craig Keogh <cskeogh src gnome org>]

commit de9ecff3d0033d12430404daa2115a59b9b1dc39
Author: Jon TURNEY <jon turney dronecode org uk>
Date:   Mon Apr 12 13:34:27 2010 +0100

    Fix autobuild after commit 8ae2eaf20517c57ebf1bb437d3abb3dcb1a6fa27

 jhbuild/frontends/autobuild.py |    2 +-
 jhbuild/frontends/tinderbox.py |    2 +-
 jhbuild/utils/cmds.py          |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/jhbuild/frontends/autobuild.py b/jhbuild/frontends/autobuild.py
index 7e9ca19..c962058 100644
--- a/jhbuild/frontends/autobuild.py
+++ b/jhbuild/frontends/autobuild.py
@@ -188,7 +188,7 @@ class AutobuildBuildScript(buildscript.BuildScript, TerminalBuildScript):
             self.server.verbose_timeout = True
 
         # close stdin
-        os.close(0)
+        sys.stdin.close()
 
         info = {}
         import socket
diff --git a/jhbuild/frontends/tinderbox.py b/jhbuild/frontends/tinderbox.py
index dde003a..ebbcdfb 100644
--- a/jhbuild/frontends/tinderbox.py
+++ b/jhbuild/frontends/tinderbox.py
@@ -252,7 +252,7 @@ class TinderboxBuildScript(buildscript.BuildScript):
         assert self.outputdir
 
         # close stdin
-        os.close(0)
+        sys.stdin.close()
 
         info = []
         import socket
diff --git a/jhbuild/utils/cmds.py b/jhbuild/utils/cmds.py
index a3e9221..7a62f51 100644
--- a/jhbuild/utils/cmds.py
+++ b/jhbuild/utils/cmds.py
@@ -173,7 +173,7 @@ def pprint_output(pipe, format_line):
         read_set.append(pipe.stdout)
     if pipe.stderr:
         read_set.append(pipe.stderr)
-    if sys.stdin:
+    if not sys.stdin.closed:
         read_set.append(sys.stdin)
 
     out_data = err_data = ''
@@ -212,8 +212,8 @@ def pprint_output(pipe, format_line):
                     format_line(err_data[:pos+1], True)
                     err_data = err_data[pos+1:]
 
-            # safeguard against tinderbox that close 0 (stdin)
-            if sys.stdin in rlist and os.isatty(0):
+            # safeguard against tinderbox that close stdin
+            if sys.stdin in rlist and sys.stdin.isatty():
                 in_chunk = os.read(sys.stdin.fileno(), 1024)
                 if pipe.stdin:
                     os.write(pipe.stdin.fileno(), in_chunk)