From 581841a19570365f014f076e9c8092455e00ae41 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Sat, 7 Dec 2013 20:59:54 -0800
Subject: [PATCH] core: style nitpicks

---
 lib/vagrant/action/builtin/provision.rb | 6 ++++--
 templates/locales/en.yml                | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/vagrant/action/builtin/provision.rb b/lib/vagrant/action/builtin/provision.rb
index 32f7f9d80..f9732b84b 100644
--- a/lib/vagrant/action/builtin/provision.rb
+++ b/lib/vagrant/action/builtin/provision.rb
@@ -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")
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 042256683..4094907f8 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -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: |-