浏览代码

Merge branch 'lock-file-writes' of https://github.com/tsloughter/rebar3 into tsloughter-lock-file-writes

pull/2232/head
Fred Hebert 5 年前
父节点
当前提交
d204929f69
共有 2 个文件被更改,包括 8 次插入1 次删除
  1. +7
    -0
      src/rebar_config.erl
  2. +1
    -1
      src/rebar_prv_lock.erl

+ 7
- 0
src/rebar_config.erl 查看文件

@ -31,6 +31,7 @@
,consult_app_file/1
,consult_file/1
,consult_lock_file/1
,maybe_write_lock_file/3
,write_lock_file/2
,verify_config_format/1
,format_error/1
@ -110,6 +111,12 @@ warn_vsn_once() ->
"upgrade Rebar3.", [])
end.
%% Only call `write_lock_file/2' if the locks have changed.
maybe_write_lock_file(LockFile, Locks, OldLocks) when Locks =/= OldLocks ->
write_lock_file(LockFile, Locks);
maybe_write_lock_file(_, _, _) ->
ok.
%% @doc Converts the internal format for locks into the multi-version
%% compatible one used within rebar3 lock files.
%% @end

+ 1
- 1
src/rebar_prv_lock.erl 查看文件

@ -35,7 +35,7 @@ do(State) ->
OldLocks = rebar_state:get(State, {locks, default}, []),
Locks = lists:keysort(1, build_locks(State)),
Dir = rebar_state:dir(State),
rebar_config:write_lock_file(filename:join(Dir, ?LOCK_FILE), Locks),
rebar_config:maybe_write_lock_file(filename:join(Dir, ?LOCK_FILE), Locks, OldLocks),
State1 = rebar_state:set(State, {locks, default}, Locks),
OldLockNames = [element(1,L) || L <- OldLocks],

正在加载...
取消
保存