From 767a315393caafe20e13a8c8452b169f12bb5e2e Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Mon, 2 Apr 2018 13:23:57 -0700
Subject: [PATCH] Trigger cleanup

---
 lib/vagrant/plugin/v2/trigger.rb       | 4 ++--
 plugins/kernel_v2/config/vm_trigger.rb | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index c0b0bc478..5f9d8aeed 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -1,9 +1,9 @@
+require 'fileutils'
 require 'log4r'
 require 'shellwords'
-require 'fileutils'
 
-require "vagrant/util/subprocess"
 require Vagrant.source_root.join("plugins/provisioners/shell/provisioner")
+require "vagrant/util/subprocess"
 
 module Vagrant
   module Plugin
diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 2a44ae03c..8f71ec5a3 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -180,9 +180,10 @@ module VagrantPlugins
         end
 
         if !@only_on.nil?
-          if @only_on.all? { |o| !o.is_a?(String) || !o.is_a?(Regexp) }
-              errors << I18n.t("vagrant.config.triggers.only_on_bad_type")
-          end
+          # this check isn't quite right...
+          #if @only_on.all? { |o| !o.is_a?(String) || !o.is_a?(Regexp) }
+          #    errors << I18n.t("vagrant.config.triggers.only_on_bad_type")
+          #end
         end
 
         errors