From e748aadf4f01a9227a08b85ee5b61fa217485674 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 9 Apr 2014 09:58:30 -0700
Subject: [PATCH] core: give users chance to quit for upgrade [GH-3212]

---
 CHANGELOG.md               | 1 +
 lib/vagrant/environment.rb | 2 +-
 templates/locales/en.yml   | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ff77390c..dbf839f22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 IMPROVEMENTS:
 
+  - core: 1.5 upgrade code gives users a chance to quit. [GH-3212]
   - commands/rsync-auto: An initial sync is done before watching folders. [GH-3327]
 
 BUG FIXES:
diff --git a/lib/vagrant/environment.rb b/lib/vagrant/environment.rb
index 63be3aecb..b6ff1d472 100644
--- a/lib/vagrant/environment.rb
+++ b/lib/vagrant/environment.rb
@@ -648,7 +648,7 @@ module Vagrant
     # This upgrades a home directory that was in the v1.1 format to the
     # v1.5 format. It will raise exceptions if anything fails.
     def upgrade_home_path_v1_1
-      @ui.output(I18n.t("vagrant.upgrading_home_path_v1_5"))
+      @ui.ask(I18n.t("vagrant.upgrading_home_path_v1_5"))
       collection = BoxCollection.new(
         @home_path.join("boxes"), temp_dir_root: tmp_path)
       collection.upgrade_v1_1_v1_5
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 479afbd0d..3c247c573 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -193,6 +193,10 @@ en:
       amount of disk space. After it is done upgrading, the temporary disk
       space will be freed.
 
+      Press ctrl-c now to exit if you want to remove some boxes or free
+      up some disk space.
+
+      Press any other key to continue.
     cfengine_config:
       classes_array: |-
         The 'classes' configuration must be an array.