summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2014-05-23 09:57:54 +0000
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2014-05-23 10:05:00 +0000
commitdfea805382476e3725ab6f830bdd8dbbaf8af0bc (patch)
tree8519232d09ad2515a38be4f0345869f81b46099f
parentbe427a358072931e7e4516e62aff5b26968dfd16 (diff)
downloadmorph-dfea805382476e3725ab6f830bdd8dbbaf8af0bc.tar.gz
Don't validate when loading all morphologies
This validation happened due to confusion regarding using morph to checkout baserock:baserock/morph rather than baserock:baserock/morphs. Since we now use baserock:baserock/definitions, this confusion will no longer occur.
-rw-r--r--morphlib/sysbranchdir.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/morphlib/sysbranchdir.py b/morphlib/sysbranchdir.py
index 9d96e974..23b54eb9 100644
--- a/morphlib/sysbranchdir.py
+++ b/morphlib/sysbranchdir.py
@@ -178,7 +178,9 @@ class SystemBranchDirectory(object):
mf = morphlib.morphologyfinder.MorphologyFinder(gd)
for morph in mf.list_morphologies():
text, filename = mf.read_morphology(morph)
- m = loader.load_from_string(text, filename=filename)
+ m = loader.parse_morphology_text(text, filename)
+ loader.set_defaults(m)
+ m.filename = filename
m.repo_url = self.root_repository_url
m.ref = self.system_branch_name
yield m