From 1dafc6b82e8ea6df2638aeecd7790c458738a3c5 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 20 Mar 2018 16:00:14 -0700 Subject: [PATCH 1/2] Prevent exceptions from being raised by checkpoint --- lib/vagrant/util/checkpoint_client.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/vagrant/util/checkpoint_client.rb b/lib/vagrant/util/checkpoint_client.rb index 17dcfe868..b09c5a2b5 100644 --- a/lib/vagrant/util/checkpoint_client.rb +++ b/lib/vagrant/util/checkpoint_client.rb @@ -74,6 +74,8 @@ module Vagrant if enabled && @checkpoint_thread.nil? logger.debug("starting plugin check") @checkpoint_thread = Thread.new do + Thread.current.abort_on_exception = false + Thread.current.report_on_exception = false begin Thread.current[:result] = Checkpoint.check( product: "vagrant", From 0139fe052bba87f2298bf6ad875c0a7166f27f72 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 2 Apr 2018 12:10:59 -0700 Subject: [PATCH 2/2] Only modify report_on_exception if the method is available --- lib/vagrant/util/checkpoint_client.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/vagrant/util/checkpoint_client.rb b/lib/vagrant/util/checkpoint_client.rb index b09c5a2b5..7306b2377 100644 --- a/lib/vagrant/util/checkpoint_client.rb +++ b/lib/vagrant/util/checkpoint_client.rb @@ -75,7 +75,9 @@ module Vagrant logger.debug("starting plugin check") @checkpoint_thread = Thread.new do Thread.current.abort_on_exception = false - Thread.current.report_on_exception = false + if Thread.current.respond_to?(:report_on_exception=) + Thread.current.report_on_exception = false + end begin Thread.current[:result] = Checkpoint.check( product: "vagrant",