From 860df96cd58418a884ec8eb0248920413fcce9cf Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sat, 19 Sep 2015 17:08:06 -0500 Subject: update erlware_commons --- rebar.config | 2 +- rebar.lock | 2 +- src/rebar_utils.erl | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rebar.config b/rebar.config index e2b7a43..19c59a7 100644 --- a/rebar.config +++ b/rebar.config @@ -1,7 +1,7 @@ %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- %% ex: ts=4 sw=4 ft=erlang et -{deps, [{erlware_commons, "0.15.0"}, +{deps, [{erlware_commons, "0.16.0"}, {ssl_verify_hostname, "1.0.5"}, {certifi, "0.1.1"}, {providers, "1.5.0"}, diff --git a/rebar.lock b/rebar.lock index 5d872c5..eb95423 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,6 +1,6 @@ [{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.0.4">>},0}, {<<"certifi">>,{pkg,<<"certifi">>,<<"0.1.1">>},0}, - {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"0.15.0">>},0}, + {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"0.16.0">>},0}, {<<"getopt">>,{pkg,<<"getopt">>,<<"0.8.2">>},0}, {<<"providers">>,{pkg,<<"providers">>,<<"1.5.0">>},0}, {<<"relx">>,{pkg,<<"relx">>,<<"3.5.0">>},0}, diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl index a90a18b..ccdf960 100644 --- a/src/rebar_utils.erl +++ b/src/rebar_utils.erl @@ -592,6 +592,8 @@ vcs_vsn(Vcs, Dir, Resources) -> end. %% Temp work around for repos like relx that use "semver" +vcs_vsn_cmd(Vsn, _, _) when is_binary(Vsn) -> + {plain, Vsn}; vcs_vsn_cmd(VCS, Dir, Resources) when VCS =:= semver ; VCS =:= "semver" -> vcs_vsn_cmd(git, Dir, Resources); vcs_vsn_cmd({cmd, _Cmd}=Custom, _, _) -> -- cgit v1.1