summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richardipsum@fastmail.co.uk>2015-04-04 12:13:24 +0100
committerRichard Ipsum <richardipsum@fastmail.co.uk>2015-04-04 12:31:02 +0100
commitcd3b1b243e5c43245edb068d9fc328d0815a324d (patch)
tree68dfec64810be111a1ec0be95a4b69ece3aa0248
parent134d8198ab4f1496f5986d52bad00b8a4ff1d10c (diff)
downloadmorph-cd3b1b243e5c43245edb068d9fc328d0815a324d.tar.gz
Make source resolver pass filename
Passing the filename when loading a morphology lets us give a more useful error message: e.g. ERROR: Missing field name from morphology strata/build-essential.morph instead of ERROR: Missing field name from morphology string Change-Id: I2e5b33e8154567469aa56adbf942fb7b6e9dd1ac
-rw-r--r--morphlib/sourceresolver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/sourceresolver.py b/morphlib/sourceresolver.py
index 1e64c23a..c105fced 100644
--- a/morphlib/sourceresolver.py
+++ b/morphlib/sourceresolver.py
@@ -286,7 +286,7 @@ class SourceResolver(object):
loader = morphlib.morphloader.MorphologyLoader()
text = self._get_file_contents(reponame, sha1, filename)
- morph = loader.load_from_string(text)
+ morph = loader.load_from_string(text, filename)
if morph is not None:
self._resolved_morphologies[key] = morph