Running provisioner output shows provisioner shortcut, not class

This commit is contained in:
Mitchell Hashimoto 2013-04-08 14:50:22 -07:00
parent 67917353b7
commit ba2c749d6d
2 changed files with 5 additions and 3 deletions

View File

@ -49,6 +49,8 @@ IMPROVEMENTS:
- SSH will send keep-alive packets every 5 seconds by default to - SSH will send keep-alive packets every 5 seconds by default to
keep connections alive. Can be disabled with `config.ssh.keep_alive`. [GH-516] keep connections alive. Can be disabled with `config.ssh.keep_alive`. [GH-516]
- Show a message on `vagrant up` if the machine is already running. [GH-1558] - Show a message on `vagrant up` if the machine is already running. [GH-1558]
- "Running provisioner" output now shoes the provisioner shortcut name,
rather than the less-than-helpful class name.
BUG FIXES: BUG FIXES:

View File

@ -50,7 +50,7 @@ module Vagrant
next if env[:provision_types] && \ next if env[:provision_types] && \
!env[:provision_types].include?(type_map[p]) !env[:provision_types].include?(type_map[p])
run_provisioner(env, p) run_provisioner(env, type_map[p].to_s, p)
end end
end end
end end
@ -58,9 +58,9 @@ module Vagrant
# This is pulled out into a seperate method so that users can # This is pulled out into a seperate method so that users can
# subclass and implement custom behavior if they'd like around # subclass and implement custom behavior if they'd like around
# this step. # this step.
def run_provisioner(env, p) def run_provisioner(env, name, p)
env[:ui].info(I18n.t("vagrant.actions.vm.provision.beginning", env[:ui].info(I18n.t("vagrant.actions.vm.provision.beginning",
:provisioner => p.class)) :provisioner => name))
p.provision p.provision
end end