Merge pull request #172 from tsloughter/default_release

don't override release set in cmd args
erlware · May 4, 2014 · f4d2bed · f4d2bed
2 parents 5a5ca5b + bb076f9
commit f4d2bed
Showing 1 changed file with 6 additions and 1 deletion.
diff --git 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};