diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2016-03-03 10:27:03 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2016-03-03 10:34:59 +0000 |
commit | bb139ecf1b9de3b221ff1d93c26190a8623d5d33 (patch) | |
tree | bf642e6aa93bb1f7a69e407baa29a66435d73156 | |
parent | 7067e405a7dad7976a9b7d61ed67fb8bb5042d3c (diff) | |
download | morph-bb139ecf1b9de3b221ff1d93c26190a8623d5d33.tar.gz |
Fix some test failures
These seem to have been introduced by commit fb6dd955cbc7081f47dc4391.
Change-Id: I2fb0be5f8829722264f3509f4db9473d19ea2939
-rw-r--r-- | morphlib/morphloader.py | 13 | ||||
-rw-r--r-- | yarns/implementations.yarn | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py index 1158155c..668b133e 100644 --- a/morphlib/morphloader.py +++ b/morphlib/morphloader.py @@ -597,11 +597,14 @@ class MorphologyLoader(object): @classmethod def _validate_commands(cls, morphology_name, key, commands, errors): - for cmd_index, cmd in enumerate(commands): - if not isinstance(cmd, basestring): - e = InvalidTypeError('%s[%d]' % (key, cmd_index), - str, type(cmd), morphology_name) - errors.append(e) + if commands is None: + return + + for cmd_index, cmd in enumerate(commands): # pragma: no cover + if not isinstance(cmd, basestring): + e = InvalidTypeError('%s[%d]' % (key, cmd_index), + str, type(cmd), morphology_name) + errors.append(e) @classmethod def _validate_products(cls, morphology_name, products, errors): diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn index 45bb2058..bd56bee1 100644 --- a/yarns/implementations.yarn +++ b/yarns/implementations.yarn @@ -860,7 +860,7 @@ Implementations for building systems - echo dummy configure build-commands: - echo The next command will fail - - false + - 'false' EOF git add "${chunk_name}".morph git commit -m "Update ${chunk_name} build commands" |