particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stage: use exist stack in the run method

Browse source 
Simplify context management in the `Stage.run` method by using an
`ExitStack` instead of a multiline `with` statement.
This commit is contained in:
Christian Kellner 2021-01-16 21:05:43 +01:00 • committed by Tom Gundersen
parent 79d9066861
commit 93010c7e16
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
osbuild/pipeline.py
View file

@ -1,4 +1,4 @@
import contextlib
import hashlib
import json
import os
@ -56,8 +56,13 @@ class Stage:
def run(self, tree, runner, build_tree, store, monitor, libdir):
var = store.store
with buildroot.BuildRoot(build_tree, runner, libdir, var) as build_root, \
tempfile.TemporaryDirectory(prefix="osbuild-sources-output-", dir=var) as sources_output:
with contextlib.ExitStack() as cm:
build_root = buildroot.BuildRoot(build_tree, runner, libdir, var)
cm.enter_context(build_root)
sources_tmp = tempfile.TemporaryDirectory(prefix="osbuild-sources-output-", dir=var)
sources_output = cm.enter_context(sources_tmp)
args = {
"tree": "/run/osbuild/tree",