runners: use osbuild.api.setup_stdio

Each runner used the exact same copy of `setup_stdio`, which is
now provided by `api.setup_stdio`. Use that and remove the code
duplication.
This commit is contained in:
Christian Kellner 2020-07-22 16:24:06 +02:00 committed by Tom Gundersen
parent 58e9211d71
commit 71adfced70
5 changed files with 11 additions and 69 deletions

View file

@ -1,25 +1,12 @@
#!/usr/bin/python3
import os
import subprocess
import sys
from osbuild.util import jsoncomm
def setup_stdio():
with jsoncomm.Socket.new_client("/run/osbuild/api/osbuild") as client:
req = {'method': 'setup-stdio'}
client.send(req)
msg, fds, _ = client.recv()
for io in ['stdin', 'stdout', 'stderr']:
target = getattr(sys, io)
source = fds[msg[io]]
os.dup2(source, target.fileno())
fds.close()
import osbuild.api
if __name__ == "__main__":
setup_stdio()
osbuild.api.setup_stdio()
r = subprocess.run(sys.argv[1:], check=False)
sys.exit(r.returncode)