diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-01-17 22:46:59 -0500 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-01-17 22:46:59 -0500 |
| commit | 902edde6e8d4cb7689a120f5ae72eaed531b0664 (patch) | |
| tree | 256d70ed7aa892834a2c17bfaa1cbeb65c3d92d2 | |
| parent | 3cd8a5c35fb3839f23f7e2d520c1c1ceef5e8a72 (diff) | |
| parent | f45387f7955d497bfd3f1e5d4b0ad845669d7d92 (diff) | |
Merge pull request #104 from tsloughter/master
no skip warning for seen dep that has locked version
| -rw-r--r-- | src/rebar_prv_install_deps.erl | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl index 1253edd..2247277 100644 --- a/src/rebar_prv_install_deps.erl +++ b/src/rebar_prv_install_deps.erl @@ -230,9 +230,16 @@ package_to_app(DepsDir, Packages, {Name, Vsn}) -> update_src_deps(Profile, Level, SrcDeps, PkgDeps, SrcApps, State, Update, Seen, Locks) -> case lists:foldl(fun(AppInfo, {SrcDepsAcc, PkgDepsAcc, SrcAppsAcc, StateAcc, SeenAcc, LocksAcc}) -> %% If not seen, add to list of locks to write out - case sets:is_element(rebar_app_info:name(AppInfo), SeenAcc) of + Name = rebar_app_info:name(AppInfo), + case sets:is_element(Name, SeenAcc) of true -> - warn_skip_deps(AppInfo), + %% If from lock file don't print warning about skipping + case lists:keymember(Name, 1, Locks) of + false -> + warn_skip_deps(AppInfo); + true -> + ok + end, {SrcDepsAcc, PkgDepsAcc, SrcAppsAcc, StateAcc, SeenAcc, LocksAcc}; false -> {SeenAcc1, StateAcc1} = maybe_lock(Profile, AppInfo, SeenAcc, StateAcc, Level), |