From a9a7d7c02b45af1bddec4d6133e98007a364dd9c Mon Sep 17 00:00:00 2001 From: Tuncer Ayaz Date: Sun, 17 Jul 2011 19:11:30 +0200 Subject: Apply Tidier suggestions --- src/rebar_config.erl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/rebar_config.erl b/src/rebar_config.erl index 56a8828..9d2acf3 100644 --- a/src/rebar_config.erl +++ b/src/rebar_config.erl @@ -60,7 +60,7 @@ new(ConfigFile) when is_list(ConfigFile) -> Other -> ?ABORT("Failed to load ~s: ~p~n", [ConfigFile, Other]) end; -new(#config{}=ParentConfig)-> +new(#config{opts=Opts0}=ParentConfig)-> %% 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 %% 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 %% the new and old defs. Terms ++ [local] ++ - [Opt || Opt <- ParentConfig#config.opts, Opt /= local]; + [Opt || Opt <- Opts0, Opt /= local]; {error, enoent} -> [local] ++ - [Opt || Opt <- ParentConfig#config.opts, Opt /= local]; + [Opt || Opt <- Opts0, Opt /= local]; Other -> ?ABORT("Failed to load ~s: ~p\n", [ConfigFile, Other]) end, -- cgit v1.1