From 56da32eadb0bc5b19bb34447bb0baf3bb08dc33c Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Thu, 10 Mar 2016 18:05:51 -0500 Subject: [PATCH] config: convert config version to integer '2.0' -> 200 '2.1' -> 201 '2.10' -> 210 This makes versions comparable. Signed-off-by: Philippe Proulx --- barectf/config.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/barectf/config.py b/barectf/config.py index 032cd1f..00d1da6 100644 --- a/barectf/config.py +++ b/barectf/config.py @@ -2120,10 +2120,16 @@ class _YamlConfigParser: if not _is_str_prop(version_node): raise ConfigError('"version" property (root) must be a string') - if version_node != '2.0': - raise ConfigError('unsupported version: {}'.format(version_node)) + version_node = version_node.strip() - return version_node + if version_node not in ['2.0', '2.1']: + raise ConfigError('unsupported version ({}): versions 2.0 and 2.1 are supported'.format(version_node)) + + # convert version string to comparable version integer + parts = version_node.split('.') + version = int(parts[0]) * 100 + int(parts[1]) + + return version def _get_prefix(self, root): if 'prefix' not in root: -- 2.34.1