Merge pull request #4159 from vassilevsky/windows-encodings

core: windows encoding fixes
This commit is contained in:
Mitchell Hashimoto 2014-08-06 10:01:06 -07:00
commit 9748b5d2fa
2 changed files with 2 additions and 2 deletions

View File

@ -153,7 +153,7 @@ module Vagrant
# #
# @return [String] # @return [String]
def inspect def inspect
"#<#{self.class}: #{@cwd}>" "#<#{self.class}: #{@cwd}>".encode('external')
end end
# Action runner for executing actions in the context of this environment. # Action runner for executing actions in the context of this environment.

View File

@ -124,7 +124,7 @@ module Vagrant
# Traverse each part and join it into the resulting path # Traverse each part and join it into the resulting path
original.each do |single| original.each do |single|
Dir.entries(path).each do |entry| Dir.entries(path).each do |entry|
if entry.downcase == single.downcase if entry.downcase == single.encode('filesystem').downcase
path = path.join(entry) path = path.join(entry)
end end
end end