summaryrefslogtreecommitdiff
path: root/morphlib/builder.py
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-03-15 15:27:42 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-03-15 15:27:42 +0000
commit45b5f7da7b4bcca947944d09396943de842791b5 (patch)
tree91cac20bfc29abb010c3c26f45409315de8de118 /morphlib/builder.py
parent190a2457ea1e9484017eb7a199dfb9c38536f0a3 (diff)
downloadmorph-45b5f7da7b4bcca947944d09396943de842791b5.tar.gz
Fix morph cache key to use morphology filename rather than declared name
Previously, we could get a situation where chunks named the same way in two morphologies could interfere with each other: they could generate the same cache key, resulting in their chunks overwriting each other. Now this won't happen anymore.
Diffstat (limited to 'morphlib/builder.py')
-rw-r--r--morphlib/builder.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/builder.py b/morphlib/builder.py
index 459a8d3c..6894c318 100644
--- a/morphlib/builder.py
+++ b/morphlib/builder.py
@@ -722,7 +722,7 @@ class Builder(object): # pragma: no cover
blob.morph.kind)
dict_key = {
- 'name': blob.morph.name,
+ 'filename': blob.morph.filename,
'arch': morphlib.util.arch(),
'ref': blob.morph.treeish.sha1,
'kids': ''.join(self.cachedir.key(k) for k in kids),