diff options
author | Jordan Wilberding <[email protected]> | 2014-11-20 08:35:45 -0800 |
---|---|---|
committer | Jordan Wilberding <[email protected]> | 2014-11-20 08:35:45 -0800 |
commit | 2c192466f54a7b8ffaa56fc6f9df7057c630a2bb (patch) | |
tree | c2c10db7b6834d7ed9b88a2fc2fc3c7ed3e9e5aa /src/rlx_prv_release.erl | |
parent | fb9fd6019235186a0a22f4c0b6d6ace21d6c36a0 (diff) | |
parent | 6f49c2925aa380bdbd898f6b24409f0a4ecd8f00 (diff) | |
download | relx-2c192466f54a7b8ffaa56fc6f9df7057c630a2bb.tar.gz relx-2c192466f54a7b8ffaa56fc6f9df7057c630a2bb.tar.bz2 relx-2c192466f54a7b8ffaa56fc6f9df7057c630a2bb.zip |
Merge pull request #268 from tsloughter/no_def_error_msg
fix for error message output for no default release
Diffstat (limited to 'src/rlx_prv_release.erl')
-rw-r--r-- | src/rlx_prv_release.erl | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/rlx_prv_release.erl b/src/rlx_prv_release.erl index 83c9e6d..95a31e8 100644 --- a/src/rlx_prv_release.erl +++ b/src/rlx_prv_release.erl @@ -97,19 +97,21 @@ create_dep_graph(State) -> -spec find_default_release(rlx_state:t(), rlx_depsolver:t()) -> {ok, rlx_state:t()} | relx:error(). find_default_release(State, DepGraph) -> - try rlx_state:default_configured_release(State) of - {undefined, undefined} -> - resolve_default_release(State, DepGraph); - {RelName, undefined} -> - resolve_default_version(State, DepGraph, RelName); - {undefined, Vsn} -> - ?RLX_ERROR({no_release_name, Vsn}); - {RelName, RelVsn} -> - solve_release(State, DepGraph, RelName, RelVsn); - undefined -> - ?RLX_ERROR(no_releases_in_system) + try + case rlx_state:default_configured_release(State) of + {undefined, undefined} -> + resolve_default_release(State, DepGraph); + {RelName, undefined} -> + resolve_default_version(State, DepGraph, RelName); + {undefined, Vsn} -> + ?RLX_ERROR({no_release_name, Vsn}); + {RelName, RelVsn} -> + solve_release(State, DepGraph, RelName, RelVsn); + undefined -> + ?RLX_ERROR(no_releases_in_system) + end catch - {multiple_release_names, _, _}=Error -> + throw:{multiple_release_names, _, _}=Error -> ?RLX_ERROR(Error) end. |