You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2017/08/18 15:16:33 UTC
[1/2] ambari git commit: Revert "AMBARI-21744. package_regex in
get_package_from_available() can match wrong pkg (dlysnichenko)"
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 2f4fe911b -> 5d0914c3a
refs/heads/trunk 5f6ce4ea5 -> ca8ae51af
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/5d0914c3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5d0914c3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5d0914c3
Branch: refs/heads/branch-2.6
Commit: 5d0914c3a0f61f136231e59e20804bfd8bc5aa56
Parents: 2f4fe91
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Aug 18 18:14:55 2017 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri Aug 18 18:14:55 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/5d0914c3/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 8ef1194..313b666 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
@@ -453,7 +453,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
[2/2] ambari git commit: Revert "AMBARI-21744. package_regex in
get_package_from_available() can match wrong pkg (dlysnichenko)"
Posted by dm...@apache.org.
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/trunk
Commit: ca8ae51afeff209657c19182d77e59a34cf6c0ae
Parents: 5f6ce4e
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Aug 18 18:14:55 2017 +0300
Committer: Lisnichenko Dmitro <dl...@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