Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2C87E1849F for ; Wed, 23 Sep 2015 12:29:00 +0000 (UTC) Received: (qmail 72335 invoked by uid 500); 23 Sep 2015 12:28:57 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 72133 invoked by uid 500); 23 Sep 2015 12:28:57 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 71581 invoked by uid 99); 23 Sep 2015 12:28:57 -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; Wed, 23 Sep 2015 12:28:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E46B2DFDDE; Wed, 23 Sep 2015 12:28:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kxepal@apache.org To: commits@couchdb.apache.org Date: Wed, 23 Sep 2015 12:29:38 -0000 Message-Id: <6700f0c71b294411b064cb6725832d94@git.apache.org> In-Reply-To: <692fb373a1bf46c4b15cfbbbf6c6a4e9@git.apache.org> References: <692fb373a1bf46c4b15cfbbbf6c6a4e9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [44/50] rebar commit: updated refs/heads/import to 5dea85d rebar_utils: rename internal function Project: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/commit/54a72423 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/tree/54a72423 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/diff/54a72423 Branch: refs/heads/import Commit: 54a724238f63aeaf59542c7dc7baeaf569e3fd0d Parents: 8ec3a55 Author: Tuncer Ayaz Authored: Fri Jun 12 12:56:20 2015 +0200 Committer: Tuncer Ayaz Committed: Fri Jun 12 12:56:20 2015 +0200 ---------------------------------------------------------------------- src/rebar_utils.erl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-rebar/blob/54a72423/src/rebar_utils.erl ---------------------------------------------------------------------- diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl index b250671..9681756 100644 --- a/src/rebar_utils.erl +++ b/src/rebar_utils.erl @@ -405,15 +405,15 @@ patch_env(Config, [E | Rest]) -> %% ==================================================================== otp_release() -> - rmemo:call(fun otp_release1/1, [(erlang:system_info(otp_release))]). + rmemo:call(fun otp_release_1/1, [(erlang:system_info(otp_release))]). %% If OTP <= R16, otp_release is already what we want. -otp_release1([$R,N|_]=Rel) when is_integer(N) -> +otp_release_1([$R,N|_]=Rel) when is_integer(N) -> Rel; %% If OTP >= 17.x, erlang:system_info(otp_release) returns just the %% major version number, we have to read the full version from %% a file. See http://www.erlang.org/doc/system_principles/versions.html -otp_release1(Rel) -> +otp_release_1(Rel) -> Files = [ filename:join([code:root_dir(), "releases", Rel, "OTP_VERSION"]), filename:join([code:root_dir(), "OTP_VERSION"])