almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

gather: Simplify creating temporary directory

Browse Source 
There is no need to create the directory in work/, as it will get
deleted immediately. Let's move it to /tmp and use the context manager
to clean it up.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2018-04-05 15:21:39 +02:00
parent d9e2101b08
commit b3a3575ecf
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pungi/phases/gather/methods/method_deps.py
View File

@ -20,7 +20,7 @@ from kobo.shortcuts import run
from kobo.pkgset import SimpleRpmWrapper, RpmWrapper from kobo.pkgset import SimpleRpmWrapper, RpmWrapper
from kobo.rpmlib import parse_nvra from kobo.rpmlib import parse_nvra
from pungi.util import rmtree, get_arch_variant_data from pungi.util import rmtree, get_arch_variant_data, temp_dir
from pungi.wrappers.pungi import PungiWrapper from pungi.wrappers.pungi import PungiWrapper
from pungi.arch import tree_arch_to_yum_arch, get_valid_arches from pungi.arch import tree_arch_to_yum_arch, get_valid_arches
@ -179,11 +179,8 @@ def resolve_deps(compose, arch, variant, source_name=None):
profiler=profiler) profiler=profiler)
# Use temp working directory directory as workaround for # Use temp working directory directory as workaround for
# https://bugzilla.redhat.com/show_bug.cgi?id=795137 # https://bugzilla.redhat.com/show_bug.cgi?id=795137
tmp_dir = compose.mkdtemp(prefix="pungi_") with temp_dir(prefix='pungi_') as tmp_dir:
try:
run(cmd, logfile=pungi_log, show_cmd=True, workdir=tmp_dir, env=os.environ) run(cmd, logfile=pungi_log, show_cmd=True, workdir=tmp_dir, env=os.environ)
finally:
rmtree(tmp_dir)
with open(pungi_log, "r") as f: with open(pungi_log, "r") as f:
packages, broken_deps, missing_comps_pkgs = pungi_wrapper.parse_log(f) packages, broken_deps, missing_comps_pkgs = pungi_wrapper.parse_log(f)