ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [5/5] ambari git commit: Revert "AMBARI-21744. package_regex in get_package_from_available() can match wrong pkg (dlysnichenko)"
Date Fri, 18 Aug 2017 19:37:10 GMT
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-feature-AMBARI-21450
Commit: 5d0914c3a0f61f136231e59e20804bfd8bc5aa56
Parents: 2f4fe91
Author: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Authored: Fri Aug 18 18:14:55 2017 +0300
Committer: Lisnichenko Dmitro <dlysnichenko@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


Mime
View raw message