source.py: Use the new utils._tempdir() utility to implement Source.tempdir()

1 files changed, 2 insertions, 11 deletions

diff --git a/buildstream/source.py b/buildstream/source.py
index fe03f29ed..0c546213a 100644
--- a/buildstream/source.py
+++ b/buildstream/source.py
@@ -19,11 +19,10 @@
 #        Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>
 
 import os
-import tempfile
 import shutil
 from contextlib import contextmanager
 
-from . import _yaml, _signals
+from . import _yaml, _signals, utils
 from . import ImplError
 from . import Plugin
 
@@ -96,17 +95,9 @@ class Source(Plugin):
         directory in the case of forced termination.
         """
         mirrordir = self.get_mirror_directory()
-        tempdir = tempfile.mkdtemp(dir=mirrordir)
-
-        def cleanup_tempdir():
-            if os.path.isdir(tempdir):
-                shutil.rmtree(tempdir)
-
-        with _signals.terminator(cleanup_tempdir):
+        with utils._tempdir(dir=mirrordir) as tempdir:
             yield tempdir
 
-        cleanup_tempdir()
-
     def get_consistency(self):
         """Report whether the source has a resolved reference