diff options
| -rw-r--r-- | .pylintrc | 2 | ||||
| -rw-r--r-- | mdbp/pbuilder.py | 12 | ||||
| -rw-r--r-- | mdbp/sbuild.py | 20 |
3 files changed, 16 insertions, 18 deletions
diff --git a/.pylintrc b/.pylintrc deleted file mode 100644 index fc2a971..0000000 --- a/.pylintrc +++ /dev/null @@ -1,2 +0,0 @@ -[MESSAGES CONTROL] -disable=subprocess-run-check diff --git a/mdbp/pbuilder.py b/mdbp/pbuilder.py index c2df394..a3eb228 100644 --- a/mdbp/pbuilder.py +++ b/mdbp/pbuilder.py @@ -79,14 +79,14 @@ runuser -u pbuilder -- lintian %s "${BUILDDIR:-/tmp/buildd}"/*.changes """ % (shlex.join(apt_get), shlex.join(build["lintian"].get("options", [])))) hook.chmod(0o755) cmd.extend(["--hookdir", hookdirn, str(dscpath)]) - cproc = subprocess.run(cmd, env=compute_env(build), - stdout=None if enablelog - else subprocess.DEVNULL, - stderr=subprocess.STDOUT if enablelog - else subprocess.DEVNULL) + ret = subprocess.call(cmd, env=compute_env(build), + stdout=None if enablelog + else subprocess.DEVNULL, + stderr=subprocess.STDOUT if enablelog + else subprocess.DEVNULL) clean_dir(pathlib.Path(build["output"]["directory"]), build["output"].get("artifacts", ["*"])) - sys.exit(cproc.returncode) + sys.exit(ret) if __name__ == "__main__": main() diff --git a/mdbp/sbuild.py b/mdbp/sbuild.py index 5309031..ba42932 100644 --- a/mdbp/sbuild.py +++ b/mdbp/sbuild.py @@ -90,18 +90,18 @@ def main() -> None: except KeyError: thing = str(stack.enter_context(get_dsc(build)).absolute()) - cproc = subprocess.run(["sbuild", thing], - env=dict(SBUILD_CONFIG=sbuildconf.name, - PATH="/usr/bin:/bin"), - cwd=build["output"]["directory"], - stdout=None if build["output"].get("log", True) - else subprocess.DEVNULL, - stderr=subprocess.STDOUT - if build["output"].get("log", True) - else subprocess.DEVNULL) + ret = subprocess.call(["sbuild", thing], + env=dict(SBUILD_CONFIG=sbuildconf.name, + PATH="/usr/bin:/bin"), + cwd=build["output"]["directory"], + stdout=None if build["output"].get("log", True) + else subprocess.DEVNULL, + stderr=subprocess.STDOUT + if build["output"].get("log", True) + else subprocess.DEVNULL) clean_dir(pathlib.Path(build["output"]["directory"]), build["output"].get("artifacts", ["*"])) - sys.exit(cproc.returncode) + sys.exit(ret) if __name__ == "__main__": main() |