diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2012-04-12 15:11:14 +0100 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-04-12 17:36:26 +0100 |
commit | 280af95cacefc17a569312c6157ce2baccf68ac8 (patch) | |
tree | 90b22e50332ad5a4abef3910b1b3405066cc24d7 /morphlib/cachekeycomputer.py | |
parent | 6fad174aa361b1b921fa9dae801239f2fa5fa397 (diff) | |
download | morph-280af95cacefc17a569312c6157ce2baccf68ac8.tar.gz |
cachekeycomputer: look up values in buildenv
Duplicate data less, so it should be more manageable
Diffstat (limited to 'morphlib/cachekeycomputer.py')
-rw-r--r-- | morphlib/cachekeycomputer.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/morphlib/cachekeycomputer.py b/morphlib/cachekeycomputer.py index 1cc377b3..43ebf064 100644 --- a/morphlib/cachekeycomputer.py +++ b/morphlib/cachekeycomputer.py @@ -21,8 +21,7 @@ import morphlib class CacheKeyComputer(): def __init__(self, build_env): - self._arch = morphlib.util.arch() - self._env = self._filterenv(build_env.env) + self._build_env = build_env self._calculated = {} def _filterenv(self, env): @@ -70,8 +69,8 @@ class CacheKeyComputer(): def _calculate(self, source): return { - 'arch': self._arch, - 'env': self._env, + 'arch': self._build_env.arch, + 'env': self._filterenv(self._build_env.env), 'ref': source.sha1, 'filename': source.filename, 'kids': [self.get_cache_id(dependency) |