diff --git a/osbuild/pipeline.py b/osbuild/pipeline.py index 27357a29..0b97cc5b 100644 --- a/osbuild/pipeline.py +++ b/osbuild/pipeline.py @@ -92,7 +92,7 @@ class Stage: binds=[os.fspath(tree) + ":/run/osbuild/tree"], readonly_binds=ro_binds) - return BuildResult(self, r.returncode, api.output, api.metadata) + return BuildResult(self, r.returncode, r.output, api.metadata) class Assembler: @@ -151,7 +151,7 @@ class Assembler: binds=binds, readonly_binds=ro_binds) - return BuildResult(self, r.returncode, api.output, api.metadata) + return BuildResult(self, r.returncode, r.output, api.metadata) class Pipeline: diff --git a/runners/org.osbuild.fedora30 b/runners/org.osbuild.fedora30 index 6c234d60..406ba0c0 100755 --- a/runners/org.osbuild.fedora30 +++ b/runners/org.osbuild.fedora30 @@ -3,7 +3,6 @@ import os import subprocess import sys -import osbuild.api def ldconfig(): @@ -37,7 +36,6 @@ def nsswitch(): if __name__ == "__main__": - osbuild.api.setup_stdio() ldconfig() sysusers() tmpfiles() diff --git a/runners/org.osbuild.linux b/runners/org.osbuild.linux index 7bc3706b..a023e68e 100755 --- a/runners/org.osbuild.linux +++ b/runners/org.osbuild.linux @@ -2,11 +2,8 @@ import subprocess import sys -import osbuild.api if __name__ == "__main__": - osbuild.api.setup_stdio() - r = subprocess.run(sys.argv[1:], check=False) sys.exit(r.returncode) diff --git a/runners/org.osbuild.rhel81 b/runners/org.osbuild.rhel81 index 933268a3..03f5fa12 100755 --- a/runners/org.osbuild.rhel81 +++ b/runners/org.osbuild.rhel81 @@ -3,7 +3,6 @@ import os import subprocess import sys -import osbuild.api def ldconfig(): @@ -71,7 +70,6 @@ def python_alternatives(): pass if __name__ == "__main__": - osbuild.api.setup_stdio() ldconfig() sysusers() tmpfiles() diff --git a/runners/org.osbuild.ubuntu1804 b/runners/org.osbuild.ubuntu1804 index aed4be83..406ba0c0 100755 --- a/runners/org.osbuild.ubuntu1804 +++ b/runners/org.osbuild.ubuntu1804 @@ -4,8 +4,6 @@ import os import subprocess import sys -import osbuild.api - def ldconfig(): # ld.so.conf must exist, or `ldconfig` throws a warning @@ -38,7 +36,6 @@ def nsswitch(): if __name__ == "__main__": - osbuild.api.setup_stdio() ldconfig() sysusers() tmpfiles()