diff options
| author | Jordan Wilberding <[email protected]> | 2014-05-04 20:01:24 +0200 |
|---|---|---|
| committer | Jordan Wilberding <[email protected]> | 2014-05-04 20:01:24 +0200 |
| commit | f4d2bed7028981e542fa0bc9f92536dc39b5d898 (patch) | |
| tree | f9a09db17b487e9684b7ca5c172e9f7d9619c615 | |
| parent | 5a5ca5bae78760f49e089a110171d9cbcaae6784 (diff) | |
| parent | bb076f9f4077fb2286caa8271598bfbff0a9b3d4 (diff) | |
| download | relx-0.7.0.tar.gz relx-0.7.0.tar.bz2 relx-0.7.0.zip | |
Merge pull request #172 from tsloughter/default_release0.7.0
don't override release set in cmd args
| -rw-r--r-- | src/rlx_prv_config.erl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/rlx_prv_config.erl b/src/rlx_prv_config.erl index da620be..7c2ace0 100644 --- a/src/rlx_prv_config.erl +++ b/src/rlx_prv_config.erl @@ -122,7 +122,12 @@ load_config(ConfigFile, State) -> -spec load_terms(term(), {ok, rlx_state:t()} | relx:error()) -> {ok, rlx_state:t()} | relx:error(). load_terms({default_release, RelName, RelVsn}, {ok, State}) -> - {ok, rlx_state:default_configured_release(State, RelName, RelVsn)}; + case rlx_state:default_configured_release(State) of + {undefined, undefined} -> + {ok, rlx_state:default_configured_release(State, RelName, RelVsn)}; + _ -> + {ok, State} + end; load_terms({paths, Paths}, {ok, State}) -> code:add_pathsa([filename:absname(Path) || Path <- Paths]), {ok, State}; |