From bab4a4b6aeeb12b5c1fb412a3a95c5d8c90249e4 Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Mon, 30 May 2016 14:41:57 -0300 Subject: Fix image tag to rpm version filter. --- filter_plugins/oo_filters.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'filter_plugins') diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py index 260dea92c..7510975f2 100644 --- a/filter_plugins/oo_filters.py +++ b/filter_plugins/oo_filters.py @@ -881,13 +881,12 @@ class FilterModule(object): """ if not isinstance(version, basestring): raise errors.AnsibleFilterError("|failed expects a string or unicode") - # TODO: Do we need to make this actually convert v1.2.0-rc1 into 1.2.0-0.rc1 - # We'd need to be really strict about how we build the RPM Version+Release if version.startswith("v"): version = version[1:] + # Strip release from requested version, we no longer support this. version = version.split('-')[0] - if include_dash and not version.startswith("-"): + if include_dash and version and not version.startswith("-"): version = "-" + version return version -- cgit v1.2.1