providers/virtualbox: export after checking if package exists [GH-2380]

This commit is contained in:
Mitchell Hashimoto 2013-12-31 08:45:30 -08:00
parent 6cacb86817
commit 54f4cffc00
3 changed files with 5 additions and 3 deletions

View File

@ -19,6 +19,8 @@ BUG FIXES:
[GH-2714] [GH-2714]
- commands/plugin: Fix exception that could happen rarely when installing - commands/plugin: Fix exception that could happen rarely when installing
a plugin. a plugin.
- providers/virtualbox: Error when packaging if the package already exists
_before_ the export is done. [GH-2380]
- synced\_folders/nfs: sudo will only ask for password one at a time - synced\_folders/nfs: sudo will only ask for password one at a time
when using a parallel provider [GH-2680] when using a parallel provider [GH-2680]

View File

@ -34,9 +34,9 @@ module Vagrant
raise Errors::PackageRequiresDirectory if !env["package.directory"] || raise Errors::PackageRequiresDirectory if !env["package.directory"] ||
!File.directory?(env["package.directory"]) !File.directory?(env["package.directory"])
compress
@app.call(env) @app.call(env)
compress
end end
def recover(env) def recover(env)

View File

@ -148,9 +148,9 @@ module VagrantPlugins
b2.use ClearForwardedPorts b2.use ClearForwardedPorts
b2.use PrepareNFSValidIds b2.use PrepareNFSValidIds
b2.use SyncedFolderCleanup b2.use SyncedFolderCleanup
b2.use Package
b2.use Export b2.use Export
b2.use PackageVagrantfile b2.use PackageVagrantfile
b2.use Package
end end
end end
end end