Repository: ambari Updated Branches: refs/heads/branch-2.5 bf51a82c9 -> ee87b6ab6
AMBARI-21690 Updating get_stack_version pattern match (mugdha) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ee87b6ab Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ee87b6ab Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ee87b6ab Branch: refs/heads/branch-2.5 Commit: ee87b6ab60edc43ef94a404ae2ab72da42f3549f Parents: bf51a82 Author: Mugdha Varadkar <mug...@apache.org> Authored: Thu Aug 10 11:57:28 2017 +0530 Committer: Mugdha Varadkar <mug...@apache.org> Committed: Fri Aug 11 09:56:53 2017 +0530 ---------------------------------------------------------------------- .../resource_management/libraries/functions/get_stack_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ee87b6ab/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py b/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py index 7274a59..463d61f 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py @@ -85,7 +85,7 @@ def get_stack_version(package_name): stack_version = re.sub(package_name + ' - ', '', stack_output) stack_version = stack_version.rstrip() - match = re.match('[0-9]+.[0-9]+.[0-9]+.[0-9]+-[0-9]+', stack_version) + match = re.match('[0-9]+.[0-9]+.[0-9]+.[0-9]+(-[0-9]+)?', stack_version) if match is None: Logger.info('Failed to get extracted version with ' + stack_selector_path)
