Merge pull request #11056 from briancain/fixup-windows-config-loading…

…-error Ensure proper paths are shown in config loading exceptions
hashicorp · Sep 12, 2019 · 8b4ff9c · 8b4ff9c
2 parents 2581efa + ace67cc
commit 8b4ff9c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/vagrant/config/loader.rb b/lib/vagrant/config/loader.rb
@@ -129,7 +129,7 @@ def load(order)
                 path = "(unknown)"
                 if e.backtrace && e.backtrace[0]
                   backtrace_tokens = e.backtrace[0].split(":")
-                  path = backtrace_tokens[0]
+                  path = e.backtrace.first.slice(0, e.backtrace.first.rindex(':')).rpartition(':').first
                   backtrace_tokens.each do |part|
                     if part =~ /\d+/
                       line = part.to_i

diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb
@@ -509,7 +509,7 @@ def finalize!
 
             line = "(unknown)"
             if e.backtrace && e.backtrace[0]
-              line = e.backtrace[0].split(":")[1]
+              line = e.backtrace.first.slice(0, e.backtrace.first.rindex(':')).rpartition(':').last
             end
 
             raise Vagrant::Errors::VagrantfileLoadError,