diff options
| author | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2017-02-20 12:23:34 +0000 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2017-05-11 08:24:24 +0000 |
| commit | 95d1726e4c19a5cc573b01e2a2997b53be6ad66e (patch) | |
| tree | d2c233204620f968106accf86dfb54863cc395f8 | |
| parent | 9cee3b1354e96b9882e2741977659b5de3883a5f (diff) | |
| download | ybd-95d1726e4c19a5cc573b01e2a2997b53be6ad66e.tar.gz | |
If definition contains sha:, it always overrides ref:
| -rw-r--r-- | ybd/config/defaults.conf | 1 | ||||
| -rw-r--r-- | ybd/morphs.py | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ybd/config/defaults.conf b/ybd/config/defaults.conf index 8d3576b..28f1403 100644 --- a/ybd/config/defaults.conf +++ b/ybd/config/defaults.conf @@ -22,6 +22,7 @@ morph-fields: ['arch', 'repo', 'sha', 'rpm-metadata', + 'sha', 'subsystems', 'submodules', 'systems', diff --git a/ybd/morphs.py b/ybd/morphs.py index a9aa035..a19ef88 100644 --- a/ybd/morphs.py +++ b/ybd/morphs.py @@ -196,6 +196,11 @@ class Morphs(object): dn = self._data.get(new_def['path']) if dn: + if dn.get('sha'): + if len(dn['sha']) != 40: + log(new_def, 'ERROR: invalid sha:', dn['sha'], exit=True) + dn['ref'] = dn['sha'] + if (dn.get('ref') is None or new_def.get('ref') is None): for key in new_def: if key is not 'name': |