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

core: re-arrange some code to make things easier to read later

This commit is contained in:
Mitchell Hashimoto 2013-12-31 08:18:26 -08:00
parent f89c4412b2
commit 8c03e48320
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/vagrant/action/builtin/box_add.rb
View File

@ -19,6 +19,19 @@ module Vagrant
def call(env)
@download_interrupted = false
box_name = env[:box_name]
box_formats = env[:box_provider]
if box_formats
# Determine the formats a box can support and allow the box to
# be any of those formats.
provider_plugin = Vagrant.plugin("2").manager.providers[env[:box_provider]]
if provider_plugin
box_formats = provider_plugin[1][:box_format]
box_formats ||= env[:box_provider]
end
end
# Determine the checksum type to use
checksum = (env[:box_checksum] || "").to_s
checksum_klass = nil
@ -68,7 +81,7 @@ module Vagrant
@logger.info("Expected checksum: #{checksum}")
env[:ui].info(I18n.t("vagrant.actions.box.add.checksumming",
name: env[:box_name]))
name: box_name))
actual = FileChecksum.new(@temp_path, checksum_klass).checksum
if actual != checksum
raise Errors::BoxChecksumMismatch,
@ -77,26 +90,15 @@ module Vagrant
end
end
box_formats = env[:box_provider]
if box_formats
# Determine the formats a box can support and allow the box to
# be any of those formats.
provider_plugin = Vagrant.plugin("2").manager.providers[env[:box_provider]]
if provider_plugin
box_formats = provider_plugin[1][:box_format]
box_formats ||= env[:box_provider]
end
end
# Add the box
env[:ui].info I18n.t("vagrant.actions.box.add.adding", :name => env[:box_name])
env[:ui].info I18n.t("vagrant.actions.box.add.adding", :name => box_name)
box_added = nil
begin
box_added = env[:box_collection].add(
@temp_path, env[:box_name], box_formats, env[:box_force])
@temp_path, box_name, box_formats, env[:box_force])
rescue Vagrant::Errors::BoxUpgradeRequired
# Upgrade the box
env[:box_collection].upgrade(env[:box_name])
env[:box_collection].upgrade(box_name)
# Try adding it again
retry