diff options
author | John Keiser <john@johnkeiser.com> | 2016-04-16 21:22:16 -0700 |
---|---|---|
committer | John Keiser <john@johnkeiser.com> | 2016-04-18 14:21:02 -0700 |
commit | 31f9ada8660a2831204aca436e343b6a10b103cd (patch) | |
tree | 9d22ab219a02c3f7303ec056c989e858a87a68f7 /omnibus/files | |
parent | ea2593fe58037739c5c2ada517e3d988dec290ff (diff) | |
download | chef-31f9ada8660a2831204aca436e343b6a10b103cd.tar.gz |
Allow Windows to freeze
Diffstat (limited to 'omnibus/files')
-rw-r--r-- | omnibus/files/chef-appbundle/build-chef-appbundle.rb | 5 | ||||
-rw-r--r-- | omnibus/files/chef/build-chef.rb | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/omnibus/files/chef-appbundle/build-chef-appbundle.rb b/omnibus/files/chef-appbundle/build-chef-appbundle.rb index 5e4a6afdfd..da6a4dc970 100644 --- a/omnibus/files/chef-appbundle/build-chef-appbundle.rb +++ b/omnibus/files/chef-appbundle/build-chef-appbundle.rb @@ -50,10 +50,7 @@ module BuildChefAppbundle # "test", "changelog" and "guard" come from berkshelf, "maintenance" comes from chef # "tools" and "integration" come from inspec shellout!("#{bundle_bin} config --local without #{without_groups.join(":")}", env: env, cwd: installed_path) - # TODO Windows cannot be frozen, because Bundler doesn't understand platform-specific - # versions. However, on Windows we have explicit version pins for most things, so - # we will *probably* get the exact versions of everything we want. - shellout!("#{bundle_bin} config --local frozen 1") unless windows? + shellout!("#{bundle_bin} config --local frozen 1") shellout!("#{bundle_bin} check", env: env, cwd: installed_path) diff --git a/omnibus/files/chef/build-chef.rb b/omnibus/files/chef/build-chef.rb index dd2f76e049..a4a6becfdd 100644 --- a/omnibus/files/chef/build-chef.rb +++ b/omnibus/files/chef/build-chef.rb @@ -78,7 +78,7 @@ module BuildChef # Emit blank line to separate different tasks log.info(log_key) { "" } log.info(log_key) { "Properly installing git or path sourced gem #{gem_path} using rake install" } - shellout!("#{bundle_bin} exec #{rake_bin} install --trace", env: chef_env, cwd: gem_path) + shellout!("#{bundle_bin} exec #{rake_bin} install", env: chef_env, cwd: gem_path) end end end |