diff options
| author | Tristan Sloughter <[email protected]> | 2014-11-03 12:27:18 -0600 |
|---|---|---|
| committer | Tristan Sloughter <[email protected]> | 2014-11-03 17:22:52 -0600 |
| commit | 5fbc0518ad86e3c3d109c4f714673c854cba9ed6 (patch) | |
| tree | 02d9330baaac9192e354775b62d95f74231765e5 | |
| parent | 1b62290e6111f89881dd8ce5302fe8c6296baad1 (diff) | |
| download | relx-5fbc0518ad86e3c3d109c4f714673c854cba9ed6.tar.gz relx-5fbc0518ad86e3c3d109c4f714673c854cba9ed6.tar.bz2 relx-5fbc0518ad86e3c3d109c4f714673c854cba9ed6.zip | |
support proper return value of ec_git_vsn of {ok, string()}
| -rw-r--r-- | rebar.config | 2 | ||||
| -rw-r--r-- | src/rlx_config.erl | 3 |
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. |