build(appup): fix module delete instructions
when there is a application_restart instruction, there is no need to add module delete instructions
This commit is contained in:
parent
ca5637b4a3
commit
cedeff4dab
|
@ -272,8 +272,9 @@ do_merge_update_actions(App, {New0, Changed0, Deleted0}, OldActions) ->
|
||||||
New = New0 -- AlreadyHandled,
|
New = New0 -- AlreadyHandled,
|
||||||
Changed = Changed0 -- AlreadyHandled,
|
Changed = Changed0 -- AlreadyHandled,
|
||||||
Deleted = Deleted0 -- AlreadyHandled,
|
Deleted = Deleted0 -- AlreadyHandled,
|
||||||
|
HasRestart = contains_restart_application(App, OldActions),
|
||||||
Actions =
|
Actions =
|
||||||
case contains_restart_application(App, OldActions) of
|
case HasRestart of
|
||||||
true ->
|
true ->
|
||||||
[];
|
[];
|
||||||
false ->
|
false ->
|
||||||
|
@ -285,7 +286,12 @@ do_merge_update_actions(App, {New0, Changed0, Deleted0}, OldActions) ->
|
||||||
OldActionsWithStop ++
|
OldActionsWithStop ++
|
||||||
Actions ++
|
Actions ++
|
||||||
OldActionsAfterStop ++
|
OldActionsAfterStop ++
|
||||||
[{delete_module, M} || M <- Deleted] ++
|
case HasRestart of
|
||||||
|
true ->
|
||||||
|
[];
|
||||||
|
false ->
|
||||||
|
[{delete_module, M} || M <- Deleted]
|
||||||
|
end ++
|
||||||
AppSpecific.
|
AppSpecific.
|
||||||
|
|
||||||
%% If an entry restarts an application, there's no need to use
|
%% If an entry restarts an application, there's no need to use
|
||||||
|
|
Loading…
Reference in New Issue