a8e30ac
From 38a48ea0dd01532b3ad17e9ed10c15598bc6ce32 Mon Sep 17 00:00:00 2001
a8e30ac
From: Pavel Valena <pvalena@redhat.com>
a8e30ac
Date: Mon, 1 Jul 2019 17:44:54 +0200
a8e30ac
Subject: [PATCH] Do not list / load dependencies if `vagrant` spec is not
a8e30ac
 loaded
a8e30ac
a8e30ac
in `vagrant_internal_specs` as this fails, due to `find` returning `nil`.
a8e30ac
---
a8e30ac
 lib/vagrant/bundler.rb | 5 +++--
a8e30ac
 1 file changed, 3 insertions(+), 2 deletions(-)
a8e30ac
a8e30ac
diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb
a8e30ac
index 7ba48435fa..c0fabdcead 100644
a8e30ac
--- a/lib/vagrant/bundler.rb
a8e30ac
+++ b/lib/vagrant/bundler.rb
a8e30ac
@@ -421,8 +421,9 @@ def generate_vagrant_set
a8e30ac
     def vagrant_internal_specs
a8e30ac
       # activate any dependencies up front so we can always
a8e30ac
       # pin them when resolving
a8e30ac
-      Gem::Specification.find { |s| s.name == "vagrant" && s.activated? }.
a8e30ac
-        runtime_dependencies.each { |d| gem d.name, *d.requirement.as_list }
a8e30ac
+      if (vs = Gem::Specification.find { |s| s.name == "vagrant" && s.activated? })
a8e30ac
+        vs.runtime_dependencies.each { |d| gem d.name, *d.requirement.as_list }
a8e30ac
+      end
a8e30ac
       # discover all the gems we have available
a8e30ac
       list = {}
a8e30ac
       directories = [Gem::Specification.default_specifications_dir]