diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-10-08 17:26:13 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-10-08 17:26:13 +0000 |
commit | 4cba7db4b5c34e567e2795dbc99d8b8b485ec5b1 (patch) | |
tree | 7b6daa33a67799d6d6c38b3f10b2a061000c1c80 /morphlib | |
parent | 53f9395fa3570c7f0a07825e125fc4713864af3c (diff) | |
parent | 1d9b4442eec790f1b18bc8df380a29ac0ff23e00 (diff) | |
download | morph-4cba7db4b5c34e567e2795dbc99d8b8b485ec5b1.tar.gz |
Merge remote-tracking branch 'origin/baserock/richardipsum'
Reviewed-by: Lars Wirzenius
Reviewed-by: Richard Maw
Diffstat (limited to 'morphlib')
-rw-r--r-- | morphlib/plugins/artifact_inspection_plugin.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/morphlib/plugins/artifact_inspection_plugin.py b/morphlib/plugins/artifact_inspection_plugin.py index 6c321abb..9181d488 100644 --- a/morphlib/plugins/artifact_inspection_plugin.py +++ b/morphlib/plugins/artifact_inspection_plugin.py @@ -78,7 +78,8 @@ class AutotoolsVersionGuesser(ProjectVersionGuesser): break # Then, try running autoconf against the configure script - version = self._check_autoconf_package_version(filename, data) + version = self._check_autoconf_package_version( + repo, ref, filename, data) if version: self.app.status( msg='%(repo)s: Version of %(ref)s detected ' @@ -107,7 +108,7 @@ class AutotoolsVersionGuesser(ProjectVersionGuesser): return version return None - def _check_autoconf_package_version(self, filename, data): + def _check_autoconf_package_version(self, repo, ref, filename, data): tempdir = morphlib.tempdir.Tempdir(self.app.settings['tempdir']) with open(tempdir.join(filename), 'w') as f: f.write(data) |