checkpoint_client.rb in vagrant-unbundled-2.0.4.0

- old
+ new

@@ -37,10 +37,14 @@
           require "checkpoint"
           @enabled = true
         rescue LoadError
           @logger.warn("checkpoint library not found. disabling.")
         end
+        if ENV["VAGRANT_CHECKPOINT_DISABLE"]
+          @logger.debug("checkpoint disabled via explicit user request")
+          @enabled = false
+        end
         @files = {
           signature: env.data_dir.join("checkpoint_signature"),
           cache: env.data_dir.join("checkpoint_cache")
         }
         @checkpoint_thread = nil
@@ -72,9 +76,13 @@
       # @return [self]
       def check
         if enabled && @checkpoint_thread.nil?
           logger.debug("starting plugin check")
           @checkpoint_thread = Thread.new do
+            Thread.current.abort_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",
                 version: VERSION,
                 signature_file: files[:signature],