Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: holzman/gip
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: holzman/gip
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1_2_x_release
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 11, 2011

  1. 1.3.0 release

    @holzman
    holzman committed Oct 11, 2011
    Copy the full SHA
    4e2c348 View commit details

Commits on Feb 19, 2013

  1. Make reads from child processes non-blocking

    @holzman
    John Brunelle authored and holzman committed Feb 19, 2013
    Copy the full SHA
    9d21606 View commit details

  2. Fix whitespace

    @holzman
    holzman committed Feb 19, 2013
    Copy the full SHA
    6b0864d View commit details

  3. Revert "1.3.0 release" 

    This reverts commit 4e2c348.
    @holzman
    holzman committed Feb 19, 2013
    Copy the full SHA
    04cd521 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 gip/lib/python/gip_testing.py
8 changes: 4 additions & 4 deletions gip/lib/python/gip_testing.py
View file
Original file line number Diff line number Diff line change
@@ -85,18 +85,18 @@ def runCommand(cmd, force_command=False):
for fd in fdlist: # make stdout/stderr nonblocking
fl = fcntl.fcntl(fd, fcntl.F_GETFL)
fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)

while fdlist:
time.sleep(.001) # prevent 100% CPU spin
time.sleep(.001) # prevent 100% CPU spin
ready = select.select(fdlist, [], [])
if outfd in ready[0]:
outchunk = stdout.read()
outchunk = os.read(outfd, 4096)
if outchunk == '':
fdlist.remove(outfd)
else:
outdata.write(outchunk)
if errfd in ready[0]:
errchunk = stderr.read()
errchunk = os.read(errfd, 4096)
if errchunk == '':
fdlist.remove(errfd)
else: