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

Merge pull request #10854 from briancain/fixup-typed-trigger-actions 

Ensure guest names are string when filtering trigger configs
This commit is contained in:
Brian Cain 2019-05-24 09:13:43 -07:00 committed by GitHub
parent 5ff47b5d69 eb3e309f89
commit f8eaa41b7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@ module Vagrant
match = false match = false
if trigger.only_on if trigger.only_on
trigger.only_on.each do |o| trigger.only_on.each do |o|
if o.match(guest_name) if o.match(guest_name.to_s)
# trigger matches on current guest, so we're fine to use it # trigger matches on current guest, so we're fine to use it
match = true match = true
break break

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

@ -117,7 +117,7 @@ module VagrantPlugins
@command = command.to_sym @command = command.to_sym
@ruby_block = UNSET_VALUE @ruby_block = UNSET_VALUE
@logger.debug("Trigger defined for command: #{command}") @logger.debug("Trigger defined for: #{command}")
end end
# Config option `ruby` for a trigger which reads in a ruby block and sets # Config option `ruby` for a trigger which reads in a ruby block and sets

2
test/unit/vagrant/plugin/v2/trigger_test.rb
View File

@ -74,7 +74,7 @@ describe Vagrant::Plugin::V2::Trigger do
after_triggers = triggers.after_triggers after_triggers = triggers.after_triggers
expect(after_triggers.size).to eq(3) expect(after_triggers.size).to eq(3)
subject.send(:filter_triggers, after_triggers, "ubuntu", :action) subject.send(:filter_triggers, after_triggers, :ubuntu, :action)
expect(after_triggers.size).to eq(2) expect(after_triggers.size).to eq(2)
end end