aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rebar.config2
-rw-r--r--src/rlx_config.erl3
2 files changed, 3 insertions, 2 deletions
diff --git a/rebar.config b/rebar.config
index 9c1de86..ca9894b 100644
--- a/rebar.config
+++ b/rebar.config
@@ -10,7 +10,7 @@
{branch, "master"}}},
{providers, ".*",
{git, "https://github.com/tsloughter/providers.git",
- {branch, "format_error"}}},
+ {branch, "master"}}},
{erlydtl, ".*",
{git, "https://github.com/erlydtl/erlydtl.git",
{tag, "0.9.0"}}},
diff --git a/src/rlx_config.erl b/src/rlx_config.erl
index 07ac2c5..c838c18 100644
--- a/src/rlx_config.erl
+++ b/src/rlx_config.erl
@@ -285,6 +285,7 @@ merge_configs([{Key, Value} | CliTerms], ConfigTerms) ->
end.
parse_vsn(Vsn) when Vsn =:= semver ; Vsn =:= "semver" ->
- binary_to_list(ec_git_vsn:vsn([]));
+ {ok, V} = ec_git_vsn:vsn([]),
+ V;
parse_vsn(Vsn) ->
Vsn.