Commit b5f36f9d authored by murtaugh's avatar murtaugh

removed bug related to untested websocket log code

parent aead01d2
...@@ -3,7 +3,7 @@ import sys, os, asyncio, json ...@@ -3,7 +3,7 @@ import sys, os, asyncio, json
from asyncio import create_subprocess_exec from asyncio import create_subprocess_exec
from urllib.parse import urlparse, unquote as urlunquote, quote as urlquote from urllib.parse import urlparse, unquote as urlunquote, quote as urlquote
import argparse import argparse
from asyncio.subprocess import DEVNULL, STDOUT from asyncio.subprocess import DEVNULL, STDOUT, PIPE
import aiohttp import aiohttp
""" """
...@@ -21,10 +21,11 @@ async def is_makeable (path, cwd=".", makefile="makefile"): ...@@ -21,10 +21,11 @@ async def is_makeable (path, cwd=".", makefile="makefile"):
async def make (path, cwd=".", makefile="makefile"): async def make (path, cwd=".", makefile="makefile"):
rpath = os.path.relpath(path, cwd) rpath = os.path.relpath(path, cwd)
p = await create_subprocess_exec("make", "-f", makefile, rpath, stderr = STDOUT, cwd = cwd) p = await create_subprocess_exec("make", "-f", makefile, rpath, stdout = PIPE, stderr = STDOUT, cwd = cwd)
while True: # while True:
line = await p.stdout.readline() # line = await p.stdout.readline()
log(line) # log(line)
# print (line)
ret = await p.wait() == 0 ret = await p.wait() == 0
print ("make {0}: {1}".format(path, ret), file=sys.stderr) print ("make {0}: {1}".format(path, ret), file=sys.stderr)
await log("make {0}: {1}".format(path, ret)) await log("make {0}: {1}".format(path, ret))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment