diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2015-06-01 14:14:41 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2015-06-05 12:54:45 +0000 |
commit | d873baa12f36e07e3f6d3b7f808d7f2f10763605 (patch) | |
tree | f196145d42a0183f6b3430b8834e69bd3fc0d819 /morphlib/plugins/artifact_inspection_plugin.py | |
parent | 061834bd983909ccf37927f4c0c5dd4eca827040 (diff) | |
download | morph-d873baa12f36e07e3f6d3b7f808d7f2f10763605.tar.gz |
morphlib: Use new temp_dir helper context manager
Change-Id: Ie4e024a63f2ab1c7ea66f2cbedaef99c9adf5e69
Diffstat (limited to 'morphlib/plugins/artifact_inspection_plugin.py')
-rw-r--r-- | morphlib/plugins/artifact_inspection_plugin.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/morphlib/plugins/artifact_inspection_plugin.py b/morphlib/plugins/artifact_inspection_plugin.py index b643c57c..fc433a01 100644 --- a/morphlib/plugins/artifact_inspection_plugin.py +++ b/morphlib/plugins/artifact_inspection_plugin.py @@ -20,8 +20,6 @@ import os import re import contextlib -import fs.tempfs - import morphlib from morphlib.bins import call_in_artifact_directory @@ -111,16 +109,16 @@ class AutotoolsVersionGuesser(ProjectVersionGuesser): return None def _check_autoconf_package_version(self, repo, ref, filename, data): - with contextlib.closing(fs.tempfs.TempFS( - temp_dir=self.app.settings['tempdir'])) as tempdir: - with open(tempdir.getsyspath(filename), 'w') as f: + with morphlib.util.temp_dir( + dir=self.app.settings['tempdir']) as tempdir: + with open(os.path.join(tempdir, filename), 'w') as f: f.write(data) exit_code, output, errors = self.app.runcmd_unchecked( ['autoconf', filename], ['grep', '^PACKAGE_VERSION='], ['cut', '-d=', '-f2'], ['sed', "s/'//g"], - cwd=tempdir.root_path) + cwd=tempdir) version = None if output: output = output.strip() |