From b69815402b3456699a47273a8c731850fb6b7871 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Tue, 12 Mar 2013 18:49:31 -0500 Subject: update do type spec for undefined config --- src/rcl_prv_config.erl | 4 ++-- src/relcool.erl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/rcl_prv_config.erl b/src/rcl_prv_config.erl index 60655b1..1027edf 100644 --- a/src/rcl_prv_config.erl +++ b/src/rcl_prv_config.erl @@ -54,8 +54,8 @@ do(State) -> -spec format_error(Reason::term()) -> iolist(). format_error({consult, ConfigFile, Reason}) -> - io_lib:format("Unable to read file ~s: ~s", [ConfigFile, - file:format_error(Reason)]); + io_lib:format("Unable to read file ~s: ~s", [ConfigFile, + file:format_error(Reason)]); format_error({invalid_term, Term}) -> io_lib:format("Invalid term in config file: ~p", [Term]). diff --git a/src/relcool.erl b/src/relcool.erl index c8c0cde..7750efa 100644 --- a/src/relcool.erl +++ b/src/relcool.erl @@ -70,7 +70,7 @@ main(Args) -> %% @param OutputDir - The directory where the release should be built to %% @param Configs - The list of config files for the system -spec do(atom(), string(), [goal()], [file:name()], rcl_log:log_level(), - [file:name()], file:name()) -> + [file:name()], file:name() | undefined) -> ok | error() | {ok, rcl_state:t()}. do(RelName, RelVsn, Goals, LibDirs, LogLevel, OutputDir, Config) -> {ok, Cwd} = file:get_cwd(), @@ -87,7 +87,7 @@ do(RelName, RelVsn, Goals, LibDirs, LogLevel, OutputDir, Config) -> %% @param OutputDir - The directory where the release should be built to %% @param Configs - The list of config files for the system -spec do(file:name(), atom(), string(), [goal()], [file:name()], - rcl_log:log_level(), [file:name()], file:name()) -> + rcl_log:log_level(), [file:name()], file:name() | undefined) -> ok | error() | {ok, rcl_state:t()}. do(RootDir, RelName, RelVsn, Goals, LibDirs, LogLevel, OutputDir, Configs) -> do(RootDir, RelName, RelVsn, Goals, LibDirs, LogLevel, OutputDir, [], Configs). @@ -104,7 +104,7 @@ do(RootDir, RelName, RelVsn, Goals, LibDirs, LogLevel, OutputDir, Configs) -> %% @param Overrides - A list of overrides for the system %% @param Configs - The list of config files for the system -spec do(file:name(), atom(), string(), [goal()], [file:name()], - rcl_log:log_level(), [file:name()], [{atom(), file:name()}], file:name()) -> + rcl_log:log_level(), [file:name()], [{atom(), file:name()}], file:name() | undefined) -> ok | error() | {ok, rcl_state:t()}. do(RootDir, RelName, RelVsn, Goals, LibDirs, LogLevel, OutputDir, Overrides, Config) -> State = rcl_state:new([{relname, RelName}, -- cgit v1.2.3