github/rebar
1
0
Fork 0
mirror of https://github.com/correl/rebar.git synced 2025-04-09 09:11:07 -09:00
Code Issues Projects Releases Packages Wiki Activity

Apply Tidier suggestions

Browse source
This commit is contained in:
Tuncer Ayaz 2011-07-17 19:11:30 +02:00
parent e21166ae6f
commit a9a7d7c02b
1 changed files with 3 additions and 3 deletions

6
src/rebar_config.erl
View file

@ -60,7 +60,7 @@ new(ConfigFile) when is_list(ConfigFile) ->
Other -> Other ->
?ABORT("Failed to load ~s: ~p~n", [ConfigFile, Other]) ?ABORT("Failed to load ~s: ~p~n", [ConfigFile, Other])
end; end;
new(#config{}=ParentConfig)-> new(#config{opts=Opts0}=ParentConfig)->
%% If we are at the top level we might want to load another rebar.config %% If we are at the top level we might want to load another rebar.config
%% We can be certain that we are at the top level if we don't have any %% We can be certain that we are at the top level if we don't have any
%% configs yet since if we are at another level we must have some config. %% configs yet since if we are at another level we must have some config.
@ -83,10 +83,10 @@ new(#config{}=ParentConfig)->
%% in the proplist (since order matters) between %% in the proplist (since order matters) between
%% the new and old defs. %% the new and old defs.
Terms ++ [local] ++ Terms ++ [local] ++
[Opt || Opt <- ParentConfig#config.opts, Opt /= local]; [Opt || Opt <- Opts0, Opt /= local];
{error, enoent} -> {error, enoent} ->
[local] ++ [local] ++
[Opt || Opt <- ParentConfig#config.opts, Opt /= local]; [Opt || Opt <- Opts0, Opt /= local];
Other -> Other ->
?ABORT("Failed to load ~s: ~p\n", [ConfigFile, Other]) ?ABORT("Failed to load ~s: ~p\n", [ConfigFile, Other])
end, end,