diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-08-01 16:22:03 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-08-01 16:22:03 +0100 |
| commit | 81a5a94da7091489a65781763995e8969591d8c3 (patch) | |
| tree | f8fc167e5ce1ddb6e8ea4da67a9c558c80731a82 /morphlib/morphologyfactory.py | |
| parent | 9cead0f819c128acc07d9e7499cc5bb9773915ae (diff) | |
| parent | 936fc1ec1cd9156f6aafdfcec391f12a6cf22603 (diff) | |
| download | morph-81a5a94da7091489a65781763995e8969591d8c3.tar.gz | |
Merge branch 'master' of roadtrain.codethink.co.uk:baserock/morph
Conflicts:
morphlib/morphologyfactory.py
morphlib/morphologyfactory_tests.py
Diffstat (limited to 'morphlib/morphologyfactory.py')
| -rw-r--r-- | morphlib/morphologyfactory.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/morphlib/morphologyfactory.py b/morphlib/morphologyfactory.py index 78a49125..c6ba3a4e 100644 --- a/morphlib/morphologyfactory.py +++ b/morphlib/morphologyfactory.py @@ -49,7 +49,11 @@ class MorphologyFactory(object): except: text = self._autodetect_text(reponame, sha1, filename) - morphology = morphlib.morph2.Morphology(text) + try: + morphology = morphlib.morph2.Morphology(text) + except ValueError as e: + raise morphlib.Error("Error parsing %s: %s" % + (filename, e.message)) method_name = '_check_and_tweak_%s' % morphology['kind'] if hasattr(self, method_name): |