Remove the development version warning
This commit is contained in:
parent
c3cc513609
commit
a50539bc78
22
bin/vagrant
22
bin/vagrant
|
@ -41,28 +41,6 @@ begin
|
||||||
logger.debug("Creating Vagrant environment")
|
logger.debug("Creating Vagrant environment")
|
||||||
env = Vagrant::Environment.new(opts)
|
env = Vagrant::Environment.new(opts)
|
||||||
|
|
||||||
# XXX: This is temporary and should be removed prior to release.
|
|
||||||
env.ui.warn("You're using a development version of Vagrant. This version\n" +
|
|
||||||
"makes structural changes to the `~/.vagrant.d` folder such that\n" +
|
|
||||||
"you will be _unable_ to downgrade back to a 1.0.x release. This\n" +
|
|
||||||
"affects all Vagrant environments on your computer. Other users\n" +
|
|
||||||
"of Vagrantfiles you create and use can continue to use 1.0.x without\n" +
|
|
||||||
"issue so long as it is on a computer that has never run this\n" +
|
|
||||||
"development version.\n" +
|
|
||||||
"\n" +
|
|
||||||
"This message will be removed when this version is officially released.",
|
|
||||||
:prefix => false)
|
|
||||||
result = nil
|
|
||||||
begin
|
|
||||||
result = env.ui.ask("If you're sure you'd like to continue, type 'Y' and then enter: ")
|
|
||||||
rescue Interrupt
|
|
||||||
result = nil
|
|
||||||
rescue Vagrant::Errors::UIExpectsTTY
|
|
||||||
result = nil
|
|
||||||
end
|
|
||||||
|
|
||||||
exit 0 if !result || result.upcase != "Y"
|
|
||||||
|
|
||||||
# Execute the CLI interface, and exit with the proper error code
|
# Execute the CLI interface, and exit with the proper error code
|
||||||
exit(env.cli(ARGV))
|
exit(env.cli(ARGV))
|
||||||
rescue Vagrant::Errors::VagrantError => e
|
rescue Vagrant::Errors::VagrantError => e
|
||||||
|
|
Loading…
Reference in New Issue