efdb148f61
This commit separates the scratch and output directory creation from the main package middleware into its own PackageSetupFolders middleware. Additionally, the validation that ensures an output file does not exist is moved into a validation function that can be shared across multiple methods. This refactor permits a pre-flight check to ensure box packaging would be successful before actually stopping the VM. Fixes GH-7351
39 lines
974 B
Ruby
39 lines
974 B
Ruby
require "fileutils"
|
|
|
|
require_relative "../../../../lib/vagrant/action/general/package"
|
|
|
|
module VagrantPlugins
|
|
module ProviderVirtualBox
|
|
module Action
|
|
class PackageSetupFolders
|
|
include Vagrant::Util::Presence
|
|
|
|
def initialize(app, env)
|
|
@app = app
|
|
end
|
|
|
|
def call(env)
|
|
env["package.output"] ||= "package.box"
|
|
env["package.directory"] ||= Dir.mktmpdir("package-", env[:tmp_path])
|
|
|
|
# Match up a couple environmental variables so that the other parts of
|
|
# Vagrant will do the right thing.
|
|
env["export.temp_dir"] = env["package.directory"]
|
|
|
|
Vagrant::Action::General::Package.validate!(
|
|
env["package.output"], env["package.directory"])
|
|
|
|
@app.call(env)
|
|
end
|
|
|
|
def recover(env)
|
|
dir = env["package.directory"]
|
|
if File.exist?(dir)
|
|
FileUtils.rm_rf(dir)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|