diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-15 11:05:07 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-15 11:05:07 +0000 |
| commit | 13cded5a796889c748e60ffa17fc92bad592bf39 (patch) | |
| tree | 6566be1801d1f8d51aded330bcc1b277e764bdcd /morphlib/cachekeycomputer.py | |
| parent | 8046bf0aa9e3258be6ed79dc529ac6373c37c2d7 (diff) | |
| parent | 4b5f45f6c9833f2c81dbbd1eef7a0ff09b73e401 (diff) | |
| download | morph-13cded5a796889c748e60ffa17fc92bad592bf39.tar.gz | |
Merge branch 'samthursfield/arch'
Reviewed-By: concensus
Diffstat (limited to 'morphlib/cachekeycomputer.py')
| -rw-r--r-- | morphlib/cachekeycomputer.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/morphlib/cachekeycomputer.py b/morphlib/cachekeycomputer.py index 244257a0..6acf654b 100644 --- a/morphlib/cachekeycomputer.py +++ b/morphlib/cachekeycomputer.py @@ -27,7 +27,7 @@ class CacheKeyComputer(object): self._calculated = {} def _filterenv(self, env): - keys = ["LOGNAME", "TARGET", "TARGET_STAGE1", "TARGET_GCC_CONFIG", + keys = ["LOGNAME", "MORPH_ARCH", "TARGET", "TARGET_STAGE1", "USER", "USERNAME"] return dict([(k, env[k]) for k in keys]) @@ -79,7 +79,6 @@ class CacheKeyComputer(object): def _calculate(self, artifact): keys = { - 'arch': self._build_env.arch, 'env': self._filterenv(self._build_env.env), 'filename': artifact.source.filename, 'kids': [self.compute_key(x) for x in artifact.dependencies] |