haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure that :all triggers don't get filtered out

This commit is contained in:
Brian Cain 2018-03-30 15:37:03 -07:00
parent 600557ff24
commit 85dedf25d9
No known key found for this signature in database
GPG Key ID: 43D51080D357A001
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/vagrant/plugin/v2/trigger.rb
View File

@ -35,9 +35,13 @@ module Vagrant
# get all triggers matching action # get all triggers matching action
triggers = [] triggers = []
if stage == :before if stage == :before
triggers = config.before_triggers.select { |t| t.command == action } triggers = config.before_triggers.select do |t|
t.command == action || (t.command == :all && !t.ignore.any?(action))
end
elsif stage == :after elsif stage == :after
triggers = config.after_triggers.select { |t| t.command == action } triggers = config.after_triggers.select do |t|
t.command == action || (t.command == :all && !t.ignore.any?(action))
end
else else
raise Errors::TriggersNoStageGiven, raise Errors::TriggersNoStageGiven,
action: action, action: action,

4
plugins/kernel_v2/config/vm_trigger.rb
View File

@ -92,7 +92,7 @@ module VagrantPlugins
@info = nil if @info == UNSET_VALUE @info = nil if @info == UNSET_VALUE
@warn = nil if @warn == UNSET_VALUE @warn = nil if @warn == UNSET_VALUE
@on_error = DEFAULT_ON_ERROR if @on_error == UNSET_VALUE @on_error = DEFAULT_ON_ERROR if @on_error == UNSET_VALUE
@ignore = nil if @ignore == UNSET_VALUE @ignore = [] if @ignore == UNSET_VALUE
@run = nil if @run == UNSET_VALUE @run = nil if @run == UNSET_VALUE
@run_remote = nil if @run_remote == UNSET_VALUE @run_remote = nil if @run_remote == UNSET_VALUE
@only_on = nil if @only_on == UNSET_VALUE @only_on = nil if @only_on == UNSET_VALUE
@ -139,7 +139,7 @@ module VagrantPlugins
commands.push(key) commands.push(key)
end end
if !commands.include?(@command) if !commands.include?(@command) && @command != :all
machine.ui.warn(I18n.t("vagrant.config.triggers.bad_command_warning", machine.ui.warn(I18n.t("vagrant.config.triggers.bad_command_warning",
cmd: @command)) cmd: @command))
end end