Changeset 6117 for trunk/lang

Timestamp:

Mar 10, 2016 12:50:35 PM (8 years ago)

Author:

ldelgass

Message:

merge r6114 from 1.5 branch

Location:

trunk

Files:

• . (modified) (1 prop)
• lang/python/Rappture/tools.py (modified) (5 diffs)

trunk/lang/python/Rappture/tools.py

@@ -111 +111 @@
        childerr   = child.stderr
        childerrFd = childerr.fileno()
- 
+
        outEOF = False
        errEOF = False
- 
+
        while True:
            toCheck = []
@@ -135 +135 @@
                    sys.stdout.write(outChunk)
                    sys.stdout.flush()
- 
+
            if childerrFd in readyRead:
                errChunk = os.read(childerrFd,BUFSIZ)
@@ -144 +144 @@
                    sys.stderr.write(errChunk)
                    sys.stderr.flush()
- 
+
            if outEOF and errEOF:
                break
- 
+
        pid,exitStatus = os.waitpid(commandPid,0)
        commandPid = 0
@@ -155 +155 @@
           except:
              pass
- 
+
        try:
           signal.signal(signal.SIGINT,sig_INT_handler)
@@ -165 +165 @@
        except:
           print traceback.format_exc()
- 
+
        if exitStatus != 0:
            if   os.WIFSIGNALED(exitStatus):