aboutsummaryrefslogtreecommitdiffstats
path: root/src/rlx_cmd_args.erl
diff options
context:
space:
mode:
authorTristan Sloughter <[email protected]>2014-06-15 19:18:14 -0500
committerTristan Sloughter <[email protected]>2014-10-11 11:13:04 -0500
commit0516b405ccb98febcf94a8e94000f4a633569f59 (patch)
tree08eb3c09943ac68a4493ff7e2fc5925842bc4627 /src/rlx_cmd_args.erl
parent5096c28c17ea256f48ce049a43d11b172532e03e (diff)
downloadrelx-0516b405ccb98febcf94a8e94000f4a633569f59.tar.gz
relx-0516b405ccb98febcf94a8e94000f4a633569f59.tar.bz2
relx-0516b405ccb98febcf94a8e94000f4a633569f59.zip
provider task dependencies
Diffstat (limited to 'src/rlx_cmd_args.erl')
-rw-r--r--src/rlx_cmd_args.erl20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/rlx_cmd_args.erl b/src/rlx_cmd_args.erl
index 5df9392..e117d8e 100644
--- a/src/rlx_cmd_args.erl
+++ b/src/rlx_cmd_args.erl
@@ -87,15 +87,15 @@ format_error({invalid_target, Target}) ->
%%%===================================================================
%%% Internal Functions
%%%===================================================================
--spec handle_config([getopt:option()], [atom()], proplists:proplist()) ->
- {ok, {rlx_state:t(), [string()]}} |
- relx:error().
+-spec handle_config(any(), [atom()], proplists:proplist()) ->
+ {ok, {rlx_state:t(), [string()]}} | relx:error().
handle_config(Opts, Targets, CommandLineConfig) ->
- case validate_config(proplists:get_value(config, Opts, [])) of
- Error = {error, _} ->
- Error;
- {ok, Config} ->
- {ok, rlx_state:new(Config, CommandLineConfig, Targets)}
+ {ok, Config} = validate_config(proplists:get_value(config, Opts, [])),
+ case rlx_state:new(Config, CommandLineConfig, Targets) of
+ {error, Error} ->
+ {error, Error};
+ State ->
+ {ok, State}
end.
-spec convert_targets([string()]) -> {ok, release | relup} | relx:error().
@@ -117,8 +117,8 @@ convert_targets(["tar" | T], Acc) ->
convert_targets([Target | _T], _Acc) ->
?RLX_ERROR({invalid_target, Target}).
--spec validate_config(file:filename() | undefined) ->
- {ok, file:filename() | undefined} | relx:error().
+-spec validate_config(file:filename() | list() | undefined) ->
+ {ok, file:filename() | list() | undefined}.
validate_config(undefined) ->
{ok, undefined};
validate_config("") ->