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

core: fix exception case regression from yesterday

This commit is contained in:
Mitchell Hashimoto 2013-11-24 16:38:32 -08:00
parent 850d1484aa
commit 4bc4317607
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/vagrant/action/builtin/mixin_provisioners.rb
View File

@ -30,9 +30,9 @@ module Vagrant
# This will return a mapping of a provisioner instance to its
# type.
def provisioner_type_map
def provisioner_type_map(env)
# Call this in order to initial the map if it hasn't been already
provisioner_instances
provisioner_instances(env)
# Return the type map
@_provisioner_types

5
lib/vagrant/action/builtin/provision.rb
View File

@ -60,11 +60,12 @@ module Vagrant
# Actually provision if we enabled it
if enabled
type_map = provisioner_type_map(env)
provisioner_instances(env).each do |p|
next if env[:provision_types] && \
!env[:provision_types].include?(provisioner_type_map[p])
!env[:provision_types].include?(type_map[p])
run_provisioner(env, provisioner_type_map[p].to_s, p)
run_provisioner(env, type_map[p].to_s, p)
end
end
end

4
lib/vagrant/action/builtin/provisioner_cleanup.rb
View File

@ -27,11 +27,13 @@ module Vagrant
end
def do_cleanup(env)
type_map = provisioner_type_map(env)
# Ask the provisioners to modify the configuration if needed
provisioner_instances(env).each do |p|
env[:ui].info(I18n.t(
"vagrant.provisioner_cleanup",
name: provisioner_type_map[p].to_s))
name: type_map[p].to_s))
p.cleanup
end
end