projects / packages / vagrant.git / blame
| Commit | Line | Data |
|---|---|---|
| ab6f2b85 ER |
1 | enable checkpoint only if VAGRANT_CHECKPOINT_ENABLE=1 is set |
| 2 | ||
| 3 | --- vagrant-1.7.1/lib/vagrant/environment.rb~ 2015-02-01 20:31:59.000000000 +0200 | |
| 4 | +++ vagrant-1.7.1/lib/vagrant/environment.rb 2015-02-01 20:37:14.419051054 +0200 | |
| 5 | @@ -5,7 +5,6 @@ | |
| 6 | require 'set' | |
| 7 | require 'thread' | |
| 8 | ||
| 9 | -require "checkpoint" | |
| 10 | require 'log4r' | |
| 11 | ||
| 12 | require 'vagrant/util/file_mode' | |
| 13 | @@ -134,12 +133,20 @@ | |
| 14 | @checkpoint_thr = Thread.new do | |
| 15 | Thread.current[:result] = nil | |
| 16 | ||
| 17 | + # Must enable by env var | |
| 18 | + if ENV["VAGRANT_CHECKPOINT_ENABLE"].to_s != "" | |
| 19 | + @logger.info("checkpoint: not enabled from env var") | |
| 20 | + next | |
| 21 | + end | |
| 22 | + | |
| 23 | # If we disabled checkpoint via env var, don't run this | |
| 24 | if ENV["VAGRANT_CHECKPOINT_DISABLE"].to_s != "" | |
| 25 | @logger.info("checkpoint: disabled from env var") | |
| 26 | next | |
| 27 | end | |
| 28 | ||
| 29 | + require "checkpoint" | |
| 30 | + | |
| 31 | # If we disabled state and knowing what alerts we've seen, then | |
| 32 | # disable the signature file. | |
| 33 | signature_file = @data_dir.join("checkpoint_signature") | |
| 86f0f949 ER |
34 | --- vagrant-1.7.2/vagrant.gemspec~ 2015-02-01 21:26:08.000000000 +0200 |
| 35 | +++ vagrant-1.7.2/vagrant.gemspec 2015-02-01 21:26:30.022042723 +0200 | |
| ab6f2b85 ER |
36 | @@ -20,7 +20,6 @@ |
| 37 | s.add_dependency "erubis", "~> 2.7.0" | |
| 38 | s.add_dependency "i18n", "~> 0.6.0" | |
| 86f0f949 | 39 | s.add_dependency "listen", "~> 2.8.0" |
| ab6f2b85 ER |
40 | - s.add_dependency "hashicorp-checkpoint", "~> 0.1.1" |
| 41 | s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" | |
| 42 | s.add_dependency "net-ssh", ">= 2.6.6", "< 2.10.0" | |
| 43 | s.add_dependency "net-sftp", "~> 2.1" |