From d958fe6caccec4be6d25876769a7e27c5f7c2af6 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Wed, 19 Oct 2016 12:44:54 -0400 Subject: [PATCH] add version number verification for fuel projects Add version number verification rules for release-type==fuel, matching the standard rules. Make the error message that's reported for an unknown release-type clearer. Change-Id: Ia32b7badc36f29a70c3c8b5aa32649dd9e129026 Signed-off-by: Doug Hellmann --- openstack_releases/versionutils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openstack_releases/versionutils.py b/openstack_releases/versionutils.py index bbab42f054..954dd0ad66 100644 --- a/openstack_releases/versionutils.py +++ b/openstack_releases/versionutils.py @@ -33,6 +33,7 @@ _VALIDATORS = {'std': (pbr.version.SemanticVersion.from_pip_string, packaging.version.InvalidVersion, lambda x: str(x)), } +_VALIDATORS['fuel'] = _VALIDATORS['std'] def validate_version(versionstr, release_type='std'): @@ -42,7 +43,7 @@ def validate_version(versionstr, release_type='std'): """ if release_type not in _VALIDATORS: - yield 'Release Type %s not valid using \'std\'' % release_type + yield 'Release Type %r not valid using \'std\' instead' % release_type release_type = 'std' constructor, exception, canonicalise = _VALIDATORS[release_type]