diff options
author | Helmut Grohne <helmut@subdivi.de> | 2021-07-08 09:11:10 +0200 |
---|---|---|
committer | Helmut Grohne <helmut@subdivi.de> | 2021-07-08 09:11:10 +0200 |
commit | d18841b1c6729cfca1da0f0c91900a08c396a4f1 (patch) | |
tree | 316c578b53e8f72d088db251f6d1b7087f581d0b /mdbp/sbuild.py | |
parent | 1ae474fa8b329ea6fc422bbab593e04224290cea (diff) | |
download | mdbp-d18841b1c6729cfca1da0f0c91900a08c396a4f1.tar.gz |
uninline helper function temporary_static_file
Diffstat (limited to 'mdbp/sbuild.py')
-rw-r--r-- | mdbp/sbuild.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mdbp/sbuild.py b/mdbp/sbuild.py index 2841713..da0ac4b 100644 --- a/mdbp/sbuild.py +++ b/mdbp/sbuild.py @@ -7,11 +7,10 @@ import contextlib import pathlib import subprocess import sys -import tempfile import typing from .common import AddSpaceSeparatedValues, buildjson, clean_dir, \ - compute_env, get_dsc + compute_env, get_dsc, temporary_static_file PerlValue = typing.Union[None, str, typing.List[typing.Any], typing.Dict[str, typing.Any]] @@ -97,9 +96,7 @@ def main() -> None: ["mv /etc/resolv.conf.disabled /etc/resolv.conf"] with contextlib.ExitStack() as stack: - sbuildconf = stack.enter_context(tempfile.NamedTemporaryFile(mode="w")) - sbuildconf.write(perl_conf(sbc)) - sbuildconf.flush() + sbuildconf = stack.enter_context(temporary_static_file(perl_conf(sbc))) try: thing = build["input"]["sourcename"] @@ -109,7 +106,7 @@ def main() -> None: thing = str(stack.enter_context(get_dsc(build)).absolute()) ret = subprocess.call(["sbuild", *args.sbuildopts, thing], - env=dict(SBUILD_CONFIG=sbuildconf.name, + env=dict(SBUILD_CONFIG=str(sbuildconf), PATH="/usr/bin:/bin"), cwd=build["output"]["directory"], stdout=None if build["output"].get("log", True) |