AMBARI-19039: In stack version, build number should not be mandatory (Amruta Borkar via dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b5122e25 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b5122e25 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b5122e25 Branch: refs/heads/branch-feature-AMBARI-18456 Commit: b5122e258bfe5a2e56511eb9dd29a70cf1260a9c Parents: 50ead4d Author: Di Li <d...@apache.org> Authored: Mon Dec 5 16:03:50 2016 -0500 Committer: Di Li <d...@apache.org> Committed: Mon Dec 5 16:03:50 2016 -0500 ---------------------------------------------------------------------- .../python/resource_management/libraries/functions/copy_tarball.py | 2 +- .../libraries/functions/dynamic_variable_interpretation.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b5122e25/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py b/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py index 519c88b..31a9be4 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py @@ -188,7 +188,7 @@ def _get_single_version_from_stack_select(): Logger.error("Could not verify stack version by calling '{0}'. Return Code: {1}, Output: {2}.".format(get_stack_versions_cmd, str(code), str(out))) return None - matches = re.findall(r"([\d\.]+\-\d+)", out) + matches = re.findall(r"([\d\.]+(?:-\d+)?)", out) if matches and len(matches) == 1: stack_version = matches[0] http://git-wip-us.apache.org/repos/asf/ambari/blob/b5122e25/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py b/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py index ca8fe19..74db04a 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py @@ -185,7 +185,7 @@ def copy_tarballs_to_hdfs(tarball_prefix, stack_select_component_name, component (get_stack_version_cmd, str(code), str(out))) return 1 - matches = re.findall(r"([\d\.]+\-\d+)", out) + matches = re.findall(r"([\d\.]+(?:-\d+)?)", out) stack_version = matches[0] if matches and len(matches) > 0 else None if not stack_version: