diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-07-30 18:47:43 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-09-28 16:51:51 +0000 |
| commit | c521d6fa5a8a18ce3ed420d475ef0a3cc7b51ee5 (patch) | |
| tree | 26a905f38d625b35f3da798fff8ee7073b3dae3e /morphlib/sysbranchdir.py | |
| parent | 54496d7d9b6d5e1c64c5c220ab2f280e0b9e84ec (diff) | |
| download | morph-c521d6fa5a8a18ce3ed420d475ef0a3cc7b51ee5.tar.gz | |
Change how MorphologyLoader instances are created
Loading .morph files is becoming a bit more complicated, as we need to
deal with the VERSION file, and possibly soon with a DEFAULTS file as
well.
The logic of loading and parsing .morph files is done either in the
sourceresolver module, or the morphloader module. This change means that
all users of the latter module can use the get hold of a
MorphologyLoader instance with VERSION already parsed. If DEFAULTS is
added then it is also simple to parse DEFAULTS.
Change-Id: Ib33756e9dbd078e38f12dd7f776c89584b178959
Diffstat (limited to 'morphlib/sysbranchdir.py')
| -rw-r--r-- | morphlib/sysbranchdir.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/morphlib/sysbranchdir.py b/morphlib/sysbranchdir.py index d23d9eea..25fc7f67 100644 --- a/morphlib/sysbranchdir.py +++ b/morphlib/sysbranchdir.py @@ -207,8 +207,11 @@ class SystemBranchDirectory(object): for dirname in morphlib.util.find_leaves(self.root_directory, '.git')) - def load_all_morphologies(self, loader): # pragma: no cover - return self.definitions_repo.load_all_morphologies(loader) + def get_morphology_loader(self): # pragma: no cover + return self.definitions_repo.get_morphology_loader() + + def load_all_morphologies(self): # pragma: no cover + return self.definitions_repo.load_all_morphologies() def create(root_directory, root_repository_url, system_branch_name): |