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

Trigger cleanup

This commit is contained in:
Brian Cain 2018-04-02 13:23:57 -07:00
parent 693eb2fbbb
commit 767a315393
No known key found for this signature in database
GPG Key ID: 43D51080D357A001
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,9 @@
require 'fileutils'
require 'log4r' require 'log4r'
require 'shellwords' require 'shellwords'
require 'fileutils'
require "vagrant/util/subprocess"
require Vagrant.source_root.join("plugins/provisioners/shell/provisioner") require Vagrant.source_root.join("plugins/provisioners/shell/provisioner")
require "vagrant/util/subprocess"
module Vagrant module Vagrant
module Plugin module Plugin

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

@ -180,9 +180,10 @@ module VagrantPlugins
end end
if !@only_on.nil? if !@only_on.nil?
if @only_on.all? { |o| !o.is_a?(String) || !o.is_a?(Regexp) } # this check isn't quite right...
errors << I18n.t("vagrant.config.triggers.only_on_bad_type") #if @only_on.all? { |o| !o.is_a?(String) || !o.is_a?(Regexp) }
end # errors << I18n.t("vagrant.config.triggers.only_on_bad_type")
#end
end end
errors errors