aboutsummaryrefslogtreecommitdiffstats
path: root/src/rlx_config.erl
diff options
context:
space:
mode:
authorJordan Wilberding <[email protected]>2014-11-03 16:34:36 -0800
committerJordan Wilberding <[email protected]>2014-11-03 16:34:36 -0800
commit0066f8f37819c5ea1776655ea6cdffab4c95bcd5 (patch)
tree02d9330baaac9192e354775b62d95f74231765e5 /src/rlx_config.erl
parent9d550533bb1440e93f4a014cb6303f427a51f2dc (diff)
parent5fbc0518ad86e3c3d109c4f714673c854cba9ed6 (diff)
downloadrelx-0066f8f37819c5ea1776655ea6cdffab4c95bcd5.tar.gz
relx-0066f8f37819c5ea1776655ea6cdffab4c95bcd5.tar.bz2
relx-0066f8f37819c5ea1776655ea6cdffab4c95bcd5.zip
Merge pull request #251 from tsloughter/master
Bug fix and cleanup
Diffstat (limited to 'src/rlx_config.erl')
-rw-r--r--src/rlx_config.erl3
1 files changed, 2 insertions, 1 deletions
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.