robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Explicitly remove all temporary files

Browse source 
There is no guarantee __del__ will ever be called, and we were leaving a
ton of stuff in /tmp. With this patch we pass the temporary directories
explictly and make sure they are deleted at the end.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2017-01-23 10:53:46 +01:00
parent fe026bb588
commit 35e72df99f
3 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
bin/pungi-gather
View file

@ -4,13 +4,12 @@
import os
import argparse
import tempfile
import shutil
import pungi.ks
from pungi.dnf_wrapper import DnfWrapper, Conf
from pungi.gather_dnf import Gather, GatherOptions
from pungi.profiler import Profiler
from pungi.util import temp_dir
def get_parser():
@ -68,12 +67,13 @@ def get_parser():
return parser
def main():
def main(persistdir, cachedir):
parser = get_parser()
ns = parser.parse_args()
dnf_conf = Conf(ns.arch)
dnf_conf.persistdir = tempfile.mkdtemp()
dnf_conf.persistdir = persistdir
dnf_conf.cachedir = cachedir
dnf_obj = DnfWrapper(dnf_conf)
gather_opts = GatherOptions()
@ -129,7 +129,6 @@ def main():
packages.add("-%s" % i)
g.gather(packages, conditional_packages)
shutil.rmtree(dnf_conf.persistdir)
print_rpms(g)
if ns.profiler:
@ -162,4 +161,6 @@ def print_rpms(gather_obj):
if __name__ == "__main__":
main()
with temp_dir(prefix='pungi_dnf_') as persistdir:
with temp_dir(prefix='pungi_dnf_cache_') as cachedir:
main(persistdir, cachedir)