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

Merge pull request #2577 from emyl/vbox-sync-folder-cleanup 

providers/virtualbox: remove dedicated cleanup action for shared folders
This commit is contained in:
Mitchell Hashimoto 2013-12-04 07:42:30 -08:00
parent 4f17a70c4e c95fc4e27c
commit 2566373815
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/providers/virtualbox/action.rb
View File

@ -12,7 +12,6 @@ module VagrantPlugins
autoload :CleanMachineFolder, File.expand_path("../action/clean_machine_folder", __FILE__) autoload :CleanMachineFolder, File.expand_path("../action/clean_machine_folder", __FILE__)
autoload :ClearForwardedPorts, File.expand_path("../action/clear_forwarded_ports", __FILE__) autoload :ClearForwardedPorts, File.expand_path("../action/clear_forwarded_ports", __FILE__)
autoload :ClearNetworkInterfaces, File.expand_path("../action/clear_network_interfaces", __FILE__) autoload :ClearNetworkInterfaces, File.expand_path("../action/clear_network_interfaces", __FILE__)
autoload :ClearSharedFolders, File.expand_path("../action/clear_shared_folders", __FILE__)
autoload :Created, File.expand_path("../action/created", __FILE__) autoload :Created, File.expand_path("../action/created", __FILE__)
autoload :Customize, File.expand_path("../action/customize", __FILE__) autoload :Customize, File.expand_path("../action/customize", __FILE__)
autoload :Destroy, File.expand_path("../action/destroy", __FILE__) autoload :Destroy, File.expand_path("../action/destroy", __FILE__)
@ -59,7 +58,6 @@ module VagrantPlugins
b.use PrepareForwardedPortCollisionParams b.use PrepareForwardedPortCollisionParams
b.use HandleForwardedPortCollisions b.use HandleForwardedPortCollisions
b.use PruneNFSExports b.use PruneNFSExports
b.use ClearSharedFolders
b.use SyncedFolderCleanup b.use SyncedFolderCleanup
b.use SyncedFolders b.use SyncedFolders
b.use PrepareNFSSettings b.use PrepareNFSSettings
@ -148,7 +146,7 @@ module VagrantPlugins
b2.use CheckAccessible b2.use CheckAccessible
b2.use action_halt b2.use action_halt
b2.use ClearForwardedPorts b2.use ClearForwardedPorts
b2.use ClearSharedFolders b2.use SyncedFolderCleanup
b2.use Export b2.use Export
b2.use PackageVagrantfile b2.use PackageVagrantfile
b2.use Package b2.use Package

17
plugins/providers/virtualbox/action/clear_shared_folders.rb
View File

@ -1,17 +0,0 @@
module VagrantPlugins
module ProviderVirtualBox
module Action
class ClearSharedFolders
def initialize(app, env)
@app = app
end
def call(env)
env[:machine].provider.driver.clear_shared_folders
@app.call(env)
end
end
end
end
end

4
plugins/providers/virtualbox/synced_folder.rb
View File

@ -61,6 +61,10 @@ module VagrantPlugins
end end
end end
def cleanup(machine)
driver.clear_shared_folders
end
protected protected
# This is here so that we can stub it for tests # This is here so that we can stub it for tests