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

core: give users chance to quit for upgrade [GH-3212]

This commit is contained in:
Mitchell Hashimoto 2014-04-09 09:58:30 -07:00
parent 7f9d98c922
commit e748aadf4f
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
IMPROVEMENTS: 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] - commands/rsync-auto: An initial sync is done before watching folders. [GH-3327]
BUG FIXES: BUG FIXES:

2
lib/vagrant/environment.rb
View File

@ -648,7 +648,7 @@ module Vagrant
# This upgrades a home directory that was in the v1.1 format to the # This upgrades a home directory that was in the v1.1 format to the
# v1.5 format. It will raise exceptions if anything fails. # v1.5 format. It will raise exceptions if anything fails.
def upgrade_home_path_v1_1 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( collection = BoxCollection.new(
@home_path.join("boxes"), temp_dir_root: tmp_path) @home_path.join("boxes"), temp_dir_root: tmp_path)
collection.upgrade_v1_1_v1_5 collection.upgrade_v1_1_v1_5

4
templates/locales/en.yml
View File

@ -193,6 +193,10 @@ en:
amount of disk space. After it is done upgrading, the temporary disk amount of disk space. After it is done upgrading, the temporary disk
space will be freed. 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: cfengine_config:
classes_array: |- classes_array: |-
The 'classes' configuration must be an array. The 'classes' configuration must be an array.