diff options
| author | Samuel Giddins <segiddins@segiddins.me> | 2017-07-08 17:35:15 -0500 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2017-07-12 15:09:55 -0500 |
| commit | b5f9e10b53a829e3471492bae7b87c43d60de4f4 (patch) | |
| tree | 0360efcf4e165166c4cce93f4f71fceae280acae /lib/bundler/definition.rb | |
| parent | 6b2d04b892dfa9ac9b93d4cba80d59195d71449f (diff) | |
| download | bundler-b5f9e10b53a829e3471492bae7b87c43d60de4f4.tar.gz | |
Fix deployment specs under 2.0
Diffstat (limited to 'lib/bundler/definition.rb')
| -rw-r--r-- | lib/bundler/definition.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 074291414b..23b61ffd01 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -376,8 +376,13 @@ module Bundler "updated #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)} to version control." unless explicit_flag - - suggested_command = Bundler.settings.locations("frozen")[:global] == "1" ? "bundle config --delete frozen" : "bundle install --no-deployment" + suggested_command = if Bundler.settings.locations("frozen")[:global] + "bundle config --delete frozen" + elsif Bundler.settings.locations("deployment").keys.&([:global, :local]).any? + "bundle config --delete deployment" + else + "bundle install --no-deployment" + end msg << "\n\nIf this is a development machine, remove the #{Bundler.default_gemfile} " \ "freeze \nby running `#{suggested_command}`." end |