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

Fix weird exception from autoloading Vagrant::SSH

This commit is contained in:
Mitchell Hashimoto 2011-01-07 01:22:52 -08:00
parent 8d529931ef
commit 9e27355d0e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/vagrant.rb
View File

@ -15,7 +15,6 @@ module Vagrant
autoload :Errors, 'vagrant/errors' autoload :Errors, 'vagrant/errors'
autoload :Hosts, 'vagrant/hosts' autoload :Hosts, 'vagrant/hosts'
autoload :Plugin, 'vagrant/plugin' autoload :Plugin, 'vagrant/plugin'
autoload :SSH, 'vagrant/ssh'
autoload :TestHelpers, 'vagrant/test_helpers' autoload :TestHelpers, 'vagrant/test_helpers'
autoload :UI, 'vagrant/ui' autoload :UI, 'vagrant/ui'
autoload :Util, 'vagrant/util' autoload :Util, 'vagrant/util'
@ -31,9 +30,12 @@ end
# Default I18n to load the en locale # Default I18n to load the en locale
I18n.load_path << File.expand_path("templates/locales/en.yml", Vagrant.source_root) I18n.load_path << File.expand_path("templates/locales/en.yml", Vagrant.source_root)
# Load the things which must be loaded before anything else # Load the things which must be loaded before anything else. Note that
# I'm not sure why 'vagrant/ssh' must be loaded. But if I don't, I get
# a very scary "unsupported cipher" error from net-ssh for no apparent reason.
require 'vagrant/command' require 'vagrant/command'
require 'vagrant/provisioners' require 'vagrant/provisioners'
require 'vagrant/systems' require 'vagrant/systems'
require 'vagrant/ssh'
Vagrant::Action.builtin! Vagrant::Action.builtin!
Vagrant::Plugin.load! Vagrant::Plugin.load!