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

Merge pull request #9998 from chrisroberts/f-plat-wsl-pathname 

Always force string type conversion of path
This commit is contained in:
Chris Roberts 2018-07-18 16:37:07 -07:00 committed by GitHub
parent 1f279445ac 6f81d16691
commit 2ba5c74e1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/vagrant/util/platform.rb
View File

@ -392,8 +392,9 @@ module Vagrant
# @param [String, Pathname] path Path to convert # @param [String, Pathname] path Path to convert
# @return [String] # @return [String]
def wsl_to_windows_path(path) def wsl_to_windows_path(path)
path = path.to_s
if wsl? && wsl_windows_access? && !path.match(/^[a-zA-Z]:/) if wsl? && wsl_windows_access? && !path.match(/^[a-zA-Z]:/)
path = File.expand_path(path.to_s) path = File.expand_path(path)
if wsl_path?(path) if wsl_path?(path)
parts = path.split("/") parts = path.split("/")
parts.delete_if(&:empty?) parts.delete_if(&:empty?)
@ -405,13 +406,13 @@ module Vagrant
end end
path = [root_path, *parts].join("\\") path = [root_path, *parts].join("\\")
else else
path = path.to_s.sub("/mnt/", "") path = path.sub("/mnt/", "")
parts = path.split("/") parts = path.split("/")
parts.first << ":" parts.first << ":"
path = parts.join("\\") path = parts.join("\\")
end end
end end
path.to_s path
end end
# Takes a windows path and formats it to the # Takes a windows path and formats it to the

4
test/unit/vagrant/util/platform_test.rb
View File

@ -353,6 +353,10 @@ describe Vagrant::Util::Platform do
it "should include rootfs when accessing non-home path" do it "should include rootfs when accessing non-home path" do
expect(subject.wsl_to_windows_path("/tmp/test")).to include("rootfs") expect(subject.wsl_to_windows_path("/tmp/test")).to include("rootfs")
end end
it "should properly handle Pathname" do
expect(subject.wsl_to_windows_path(Pathname.new("/tmp/test"))).to include("rootfs")
end
end end
end end
end end