AMBARI-21690 Updating get_stack_version pattern match (mugdha) (cherry picked from commit ee87b6ab60edc43ef94a404ae2ab72da42f3549f)
Change-Id: I51379e33b421aff6c8bb4fa85f668870c0915d46 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ad886577 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ad886577 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ad886577 Branch: refs/heads/2.5-maint Commit: ad88657754802bd5e078741581e22a1d5472a529 Parents: 7ced0c9 Author: Mugdha Varadkar <[email protected]> Authored: Thu Aug 10 11:57:28 2017 +0530 Committer: [email protected] <[email protected]> Committed: Fri Aug 11 04:36:40 2017 +0000 ---------------------------------------------------------------------- .../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/ad886577/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)
