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

Explicitly set encodings to prevent incompatible string comparisons

This commit is contained in:
Chris Roberts 2017-06-26 20:00:43 -07:00
parent c5db5ea1c8
commit 2575ed9dc2
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/vagrant/machine.rb
View File

@ -571,19 +571,24 @@ module Vagrant
# from its previous location on disk. If the machine
# has moved, it prints a warning to the user.
def check_cwd
desired_encoding = @env.root_path.to_s.encoding
vagrant_cwd_filepath = @data_dir.join('vagrant_cwd')
vagrant_cwd = if File.exist?(vagrant_cwd_filepath)
File.read(vagrant_cwd_filepath).chomp
end
File.read(vagrant_cwd_filepath,
external_encoding: desired_encoding
).chomp
end
if vagrant_cwd.nil?
File.write(vagrant_cwd_filepath, @env.root_path)
elsif vagrant_cwd != @env.root_path.to_s
ui.warn(I18n.t(
'vagrant.moved_cwd',
old_wd: vagrant_cwd,
current_wd: @env.root_path.to_s))
File.write(vagrant_cwd_filepath, @env.root_path)
if vagrant_cwd != @env.root_path.to_s
if vagrant_cwd
ui.warn(I18n.t(
'vagrant.moved_cwd',
old_wd: "#{vagrant_cwd}",
current_wd: "#{@env.root_path.to_s}"))
end
File.write(vagrant_cwd_filepath, @env.root_path.to_s,
external_encoding: desired_encoding
)
end
end
end