diff options
| author | Joshua Timberman <joshua@opscode.com> | 2012-12-19 15:03:59 -0800 |
|---|---|---|
| committer | Joshua Timberman <joshua@opscode.com> | 2012-12-19 15:03:59 -0800 |
| commit | 7c6d8ba54f2a6c615269f0e84e1936e777532047 (patch) | |
| tree | 010ad6e7540608489e20572a562f9563c2d11ca6 | |
| parent | b3ebae1aa4e60c8d882eed9b4c948220b7c02a0d (diff) | |
| parent | 50fe69099f3b0f93cd67960306a61c3a8e949efa (diff) | |
| download | mixlib-shellout-7c6d8ba54f2a6c615269f0e84e1936e777532047.tar.gz | |
Merge pull request #17 from kendrickm/COOK-1745
COOK-1745 Removing force version of the rubyzip gem
| -rw-r--r-- | attributes/default.rb | 1 | ||||
| -rw-r--r-- | providers/zipfile.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/attributes/default.rb b/attributes/default.rb index 7d37adc..b6788b1 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -19,3 +19,4 @@ # default['windows']['allow_pending_reboots'] = true +default['windows']['rubyzipversion'] = nil
\ No newline at end of file diff --git a/providers/zipfile.rb b/providers/zipfile.rb index c34abce..d463393 100644 --- a/providers/zipfile.rb +++ b/providers/zipfile.rb @@ -84,7 +84,8 @@ def ensure_rubyzip_gem_installed rescue LoadError Chef::Log.info("Missing gem 'rubyzip'...installing now.") chef_gem "rubyzip" do - version "0.9.5" + version node['windows']['rubyzipversion'] + only_if {node['windows']['rubyzipversion']} end require 'zip/zip' end |