summaryrefslogtreecommitdiff
path: root/morphlib/morphology.py
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-01-18 10:04:58 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2012-01-18 10:04:58 +0000
commitca9952695794dfea53adfe8d2f1d53340651ce54 (patch)
treec8910e69f20f94cc1460c0bfcf2ead201a67a1f5 /morphlib/morphology.py
parent7632fac920487421139bc7f2cbf6d2e84ef7ef7b (diff)
downloadmorph-ca9952695794dfea53adfe8d2f1d53340651ce54.tar.gz
improve do-chroot script, add some links and devices, use gnu shell programs instead of busybox
Diffstat (limited to 'morphlib/morphology.py')
-rw-r--r--morphlib/morphology.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/morphlib/morphology.py b/morphlib/morphology.py
index 0dcb03f7..f04e9f7c 100644
--- a/morphlib/morphology.py
+++ b/morphlib/morphology.py
@@ -29,7 +29,11 @@ class Morphology(object):
def _load(self):
logging.debug('Loading morphology %s' % self._fp.name)
- self._dict = json.load(self._fp)
+ try:
+ self._dict = json.load(self._fp)
+ except ValueError:
+ logging.error('Failed to load morphology %s' % self._fp.name)
+ raise
if self.kind == 'stratum':
for source in self.sources: