Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 18145166C56 for ; Tue, 22 Aug 2017 13:47:34 +0200 (CEST) Received: (qmail 54217 invoked by uid 500); 22 Aug 2017 11:47:34 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 52426 invoked by uid 99); 22 Aug 2017 11:47:31 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Aug 2017 11:47:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9CB12F5F03; Tue, 22 Aug 2017 11:47:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lpuskas@apache.org To: commits@ambari.apache.org Date: Tue, 22 Aug 2017 11:47:53 -0000 Message-Id: <97d4af7562394518a6c06af3996e3b59@git.apache.org> In-Reply-To: <69ba2ab3390747f5a40ef2186d8d0fb1@git.apache.org> References: <69ba2ab3390747f5a40ef2186d8d0fb1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/51] [abbrv] ambari git commit: Revert "AMBARI-21744. package_regex in get_package_from_available() can match wrong pkg (dlysnichenko)" 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 Authored: Fri Aug 18 18:14:55 2017 +0300 Committer: Lisnichenko Dmitro 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