summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2015-06-02 13:42:55 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2015-06-12 08:56:07 +0000
commitacdc5ceb0f8d7f1a2b21ed121b4139c67b52fb30 (patch)
treebdc33f55a2d1b80949decd822381deea81af970e
parentafee581bf168dce1af9a3c6e1ac0caa82e9ab7db (diff)
downloadmorph-acdc5ceb0f8d7f1a2b21ed121b4139c67b52fb30.tar.gz
sourceresolver: Use versioned morphology loader
We don't use this globally, since other users of the MorphologyLoader don't need them to be aware of strip commands yet, and a more significant rework would be required to allow the injection of this context, because previously the MorpohologyLoader did not need any, so code which used the MorphologyLoader just created one as they needed it, rather than allowing one to be passed in where the context was available. Change-Id: Iea707a1cb2c631dd6f251b5b989d31e192f2387d
-rw-r--r--morphlib/sourceresolver.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/morphlib/sourceresolver.py b/morphlib/sourceresolver.py
index b47970b3..52b83238 100644
--- a/morphlib/sourceresolver.py
+++ b/morphlib/sourceresolver.py
@@ -593,7 +593,8 @@ class SourceResolver(object):
definitions_version = self._check_version_file(
definitions_checkout_dir)
- morph_loader = morphlib.morphloader.MorphologyLoader()
+ morph_loader = morphlib.morphloader.MorphologyLoader(
+ definitions_version=definitions_version)
# First, process the system and its stratum morphologies. These
# will all live in the same Git repository, and will point to