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

core: style nitpicks

This commit is contained in:
Mitchell Hashimoto 2013-12-07 20:59:54 -08:00
parent d3722609f4
commit 581841a195
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,9 +26,11 @@ module Vagrant
enabled = true
ignore_sentinel = true
ignore_sentinel = env[:provision_ignore_sentinel] if env.has_key?(:provision_ignore_sentinel)
sentinel_path = nil
if env.has_key?(:provision_ignore_sentinel)
ignore_sentinel = env[:provision_ignore_sentinel]
end
sentinel_path = nil
if !ignore_sentinel
@logger.info("Checking provisioner sentinel if we should run...")
sentinel_path = env[:machine].data_dir.join("action_provision")

3
templates/locales/en.yml
View File

@ -1138,7 +1138,8 @@ en:
persisting: "Persisting the VM UUID (%{uuid})..."
provision:
beginning: "Running provisioner: %{provisioner}..."
disabled_by_sentinel: "VM already provisioned. Run `vagrant provision` or use `--provision` to force it"
disabled_by_sentinel: |-
VM already provisioned. Run `vagrant provision` or use `--provision` to force it
resume:
resuming: Resuming suspended VM...
unpausing: |-