diff options
author | Ben Brown <ben.brown@codethink.co.uk> | 2017-09-01 10:07:49 +0100 |
---|---|---|
committer | Ben Brown <ben.brown@codethink.co.uk> | 2017-09-01 17:41:06 +0100 |
commit | c7603880254ed542ff4b1aae3d589d731e161870 (patch) | |
tree | 2669d9d2f59c324651362a04460a59a45d63783d | |
parent | 766559921dcb81684599c5068a725d4c46324366 (diff) | |
download | ybd-c7603880254ed542ff4b1aae3d589d731e161870.tar.gz |
Warn if 'ref' is not a sha1, assuming 'sha' is not provided
-rw-r--r-- | ybd/morphs.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ybd/morphs.py b/ybd/morphs.py index fe021ec..8364da1 100644 --- a/ybd/morphs.py +++ b/ybd/morphs.py @@ -215,9 +215,14 @@ class Morphs(object): 'WARNING: multiple definitions of %s \n' % key, '%s | %s' % (dn.get(key), new_def[key]), exit=exit) - if new_def.get('sha'): - if len(new_def['sha']) != 40: - log(new_def, 'ERROR: invalid sha:', new_def['sha'], exit=True) + sha = new_def.get('sha') + if sha: + if len(sha) != 40: + log(new_def, 'ERROR: invalid sha:', sha, exit=True) + if new_def.get('ref'): + if not sha and len(new_def['ref']) != 40: + log(new_def, 'WARNING: ref is not a sha:', new_def['ref'], + exit=False) if dn is None: self._data[new_def['path']] = new_def |