From bb076f9f4077fb2286caa8271598bfbff0a9b3d4 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 4 May 2014 11:55:11 -0500
Subject: don't override release set in cmd args

---
 src/rlx_prv_config.erl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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};
-- 
cgit v1.2.3