From dfea805382476e3725ab6f830bdd8dbbaf8af0bc Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Fri, 23 May 2014 09:57:54 +0000 Subject: 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. --- morphlib/sysbranchdir.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1