Slight cosmetic changes to get things working with emacs highlighter and commenting
This commit is contained in:
parent
c8e36274d6
commit
3e4a20d919
|
@ -23,7 +23,7 @@ module Vagrant
|
|||
#---------------------------------------------------------------
|
||||
# Class Methods
|
||||
#---------------------------------------------------------------
|
||||
class <<self
|
||||
class << self
|
||||
# Loads and returns an environment given a specific working
|
||||
# directory. If a working directory is not given, it will default
|
||||
# to the pwd.
|
||||
|
@ -203,11 +203,15 @@ module Vagrant
|
|||
# probably (read: should be) set on the VM attribute, so we do
|
||||
# nothing.
|
||||
return if vm_name
|
||||
|
||||
# Or, return if there is no root path set or the dotfile doesn't
|
||||
# exist, since we can't do anything in that case anyways.
|
||||
return if !root_path || !File.file?(dotfile_path)
|
||||
|
||||
# Empty out previously loaded vms
|
||||
vms.clear
|
||||
|
||||
# Open and parse the dotfile
|
||||
File.open(dotfile_path) do |f|
|
||||
data = { :__vagrant => f.read }
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ module Vagrant
|
|||
attr_reader :system
|
||||
attr_accessor :vm
|
||||
|
||||
class <<self
|
||||
class << self
|
||||
# Finds a virtual machine by a given UUID and either returns
|
||||
# a Vagrant::VM object or returns nil.
|
||||
def find(uuid, env=nil, vm_name=nil)
|
||||
|
@ -27,12 +27,17 @@ module Vagrant
|
|||
@vm = opts[:vm]
|
||||
|
||||
if !opts[:env].nil?
|
||||
# We have an environment, so we create a new child environment
|
||||
# specifically for this VM. This step will load any custom
|
||||
# config and such.
|
||||
@env = Vagrant::Environment.new({
|
||||
:cwd => opts[:env].cwd,
|
||||
:parent => opts[:env],
|
||||
:vm_name => opts[:vm_name],
|
||||
:vm => self
|
||||
}).load!
|
||||
|
||||
# Load the associated system.
|
||||
load_system!
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue