Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 01F6F200CF2 for ; Fri, 18 Aug 2017 21:37:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0016316D5CB; Fri, 18 Aug 2017 19:37:12 +0000 (UTC) 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 4850816D5D1 for ; Fri, 18 Aug 2017 21:37:11 +0200 (CEST) Received: (qmail 24949 invoked by uid 500); 18 Aug 2017 19:37:10 -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 24725 invoked by uid 99); 18 Aug 2017 19:37:08 -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; Fri, 18 Aug 2017 19:37:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CBE72E053D; Fri, 18 Aug 2017 19:37:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jonathanhurley@apache.org To: commits@ambari.apache.org Date: Fri, 18 Aug 2017 19:37:10 -0000 Message-Id: <12fe29e24866463daf773d8c3a0e88eb@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] ambari git commit: Revert "AMBARI-21744. package_regex in get_package_from_available() can match wrong pkg (dlysnichenko)" archived-at: Fri, 18 Aug 2017 19:37:12 -0000 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 Authored: Fri Aug 18 18:14:55 2017 +0300 Committer: Lisnichenko Dmitro 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