From c3c3605b7051ce40c1061ecdbe601c206cb0fbb3 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Tue, 6 Oct 2020 13:44:30 -0700
Subject: [PATCH] Cleanup imgutil open files and processes

Because of the way that compress pipes things between processes it would
leave open file descriptors, and running processes around for a bit.
This waits for them to exit and closes the fds before returning.
---
 src/pylorax/imgutils.py | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/pylorax/imgutils.py b/src/pylorax/imgutils.py
index d38f0563..13d9b280 100644
--- a/src/pylorax/imgutils.py
+++ b/src/pylorax/imgutils.py
@@ -77,9 +77,20 @@ def compress(command, root, outfile, compression="xz", compressargs=None):
             archive.stdin.write(os.path.basename(root).encode("utf-8") + b"\0")
             archive.stdin.close()
 
-        comp = Popen([compression] + compressargs,
-                     stdin=archive.stdout, stdout=open(outfile, "wb"))
-        comp.wait()
+        with open(outfile, "wb") as fout:
+            comp = Popen([compression] + compressargs,
+                         stdin=archive.stdout, stdout=fout)
+            comp.wait()
+
+        # Clean up the open fds and processes
+        if find:
+            find.wait()
+            find.stdout.close()
+        archive.wait()
+        if archive.stdin:
+            archive.stdin.close()
+        if archive.stdout:
+            archive.stdout.close()
         return comp.returncode
     except OSError as e:
         logger.error(e)
@@ -129,8 +140,8 @@ def mkrootfsimg(rootdir, outfile, label, size=2, sysroot=""):
 
 def mksparse(outfile, size):
     '''use os.ftruncate to create a sparse file of the given size.'''
-    fobj = open(outfile, "w")
-    os.ftruncate(fobj.fileno(), size)
+    with open(outfile, "w") as fobj:
+        os.ftruncate(fobj.fileno(), size)
 
 def mkqcow2(outfile, size, options=None):
     '''use qemu-img to create a file of the given size.