Revert "AMBARI-21744. package_regex in get_package_from_available() can match wrong pkg (dlysnichenko)"
This reverts commit aa4807ca3a850d3275b11c9ee41a0cb6c5328b9c. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ca8ae51a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ca8ae51a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ca8ae51a Branch: refs/heads/feature-branch-AMBARI-21307 Commit: ca8ae51afeff209657c19182d77e59a34cf6c0ae Parents: 5f6ce4e Author: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Authored: Fri Aug 18 18:14:55 2017 +0300 Committer: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Committed: Fri Aug 18 18:16:12 2017 +0300 ---------------------------------------------------------------------- .../src/main/python/resource_management/libraries/script/script.py | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ca8ae51a/ambari-common/src/main/python/resource_management/libraries/script/script.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/script/script.py b/ambari-common/src/main/python/resource_management/libraries/script/script.py index 6e26d99..90337f4 100644 --- a/ambari-common/src/main/python/resource_management/libraries/script/script.py +++ b/ambari-common/src/main/python/resource_management/libraries/script/script.py @@ -473,7 +473,6 @@ class Script(object): return name package_delimiter = '-' if OSCheck.is_ubuntu_family() else '_' package_regex = name.replace(STACK_VERSION_PLACEHOLDER, '(\d|{0})+'.format(package_delimiter)) - package_regex = "^{0}$".format(package_regex) for package in available_packages_in_repos: if re.match(package_regex, package): return package
