From 84c45a854c37dc7e760b4bc71f5ca44f8d1fd586 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 13 Jan 2013 16:03:34 -0800 Subject: [PATCH] Remove the ProvisionerCLeanup action from VirtualBox --- plugins/providers/virtualbox/action.rb | 2 -- .../virtualbox/action/provisioner_cleanup.rb | 25 ------------------- 2 files changed, 27 deletions(-) delete mode 100644 plugins/providers/virtualbox/action/provisioner_cleanup.rb diff --git a/plugins/providers/virtualbox/action.rb b/plugins/providers/virtualbox/action.rb index 06595942a..85c31a450 100644 --- a/plugins/providers/virtualbox/action.rb +++ b/plugins/providers/virtualbox/action.rb @@ -37,7 +37,6 @@ module VagrantPlugins autoload :NFS, File.expand_path("../action/nfs", __FILE__) autoload :Package, File.expand_path("../action/package", __FILE__) autoload :PackageVagrantfile, File.expand_path("../action/package_vagrantfile", __FILE__) - autoload :ProvisionerCleanup, File.expand_path("../action/provisioner_cleanup", __FILE__) autoload :PruneNFSExports, File.expand_path("../action/prune_nfs_exports", __FILE__) autoload :Resume, File.expand_path("../action/resume", __FILE__) autoload :SaneDefaults, File.expand_path("../action/sane_defaults", __FILE__) @@ -90,7 +89,6 @@ module VagrantPlugins b3.use CheckAccessible b3.use EnvSet, :force => true b3.use action_halt - b3.use ProvisionerCleanup b3.use PruneNFSExports b3.use Destroy b3.use CleanMachineFolder diff --git a/plugins/providers/virtualbox/action/provisioner_cleanup.rb b/plugins/providers/virtualbox/action/provisioner_cleanup.rb deleted file mode 100644 index c97e3334e..000000000 --- a/plugins/providers/virtualbox/action/provisioner_cleanup.rb +++ /dev/null @@ -1,25 +0,0 @@ -module VagrantPlugins - module ProviderVirtualBox - module Action - class ProvisionerCleanup - def initialize(app, env) - @app = app - end - - def call(env) - # Instantiate all the enabled provisioners - provisioners = env[:machine].config.vm.provisioners.map do |provisioner| - provisioner.provisioner.new(env, provisioner.config) - end - - # Call cleanup on each - provisioners.each do |instance| - instance.cleanup - end - - @app.call(env) - end - end - end - end -end