summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTristan Sloughter <tristan.sloughter@gmail.com>2015-05-09 20:57:42 -0500
committerTristan Sloughter <tristan.sloughter@gmail.com>2015-05-09 20:57:42 -0500
commit062bee5985463ef3dcd35af3b0a34b946fd710f5 (patch)
treeff9fa3c466676c3b4c5f49c16aec94bc20cb2f72 /src
parent734d4b84aa36d6341311afd44a6458c1aaa2da3a (diff)
parentf5527de4e1d5fadce619217db11727c4cb712b72 (diff)
Merge pull request #413 from rebar/fix-unlock-upgrade-warn
Further restricting skipped deps warnings
Diffstat (limited to 'src')
-rw-r--r--src/rebar_prv_install_deps.erl9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index b5358ad..bc0a113 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -304,11 +304,10 @@ update_seen_src_dep(AppInfo, Profile, Level, SrcDeps, PkgDeps, SrcApps, State, U
Name = rebar_app_info:name(AppInfo),
%% If seen from lock file or user requested an upgrade
%% don't print warning about skipping
- case lists:keymember(Name, 1, BaseLocks) orelse Upgrade of
- false ->
- warn_skip_deps(AppInfo, State);
- true ->
- ok
+ case lists:keymember(Name, 1, BaseLocks) of
+ false when Upgrade -> ok;
+ false when not Upgrade -> warn_skip_deps(AppInfo, State);
+ true -> ok
end,
%% scan for app children here if upgrading
case Upgrade of