diff options
| author | Colby Swandale <colby@taplaboratories.com> | 2016-11-23 23:56:52 +1100 |
|---|---|---|
| committer | Colby Swandale <colby@taplaboratories.com> | 2016-11-23 23:56:52 +1100 |
| commit | 6a38b0daf34fdeec5e9f7a40303b61794625c315 (patch) | |
| tree | 961407e2cd2ddce3093fce796aabe6dbd7a32646 /lib | |
| parent | 9a13439bdc044a085ee6a129ee072f4863c11973 (diff) | |
| download | bundler-6a38b0daf34fdeec5e9f7a40303b61794625c315.tar.gz | |
dont build defintion with Gemfile.lock (if present) when using inline gemfile
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/inline.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/installer.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/inline.rb b/lib/bundler/inline.rb index dec3be3e98..c0f5bd0e4f 100644 --- a/lib/bundler/inline.rb +++ b/lib/bundler/inline.rb @@ -60,7 +60,7 @@ def gemfile(install = false, options = {}, &gemfile) Bundler.ui = ui if install if install || missing_specs.call - installer = Bundler::Installer.install(Bundler.root, definition, :system => true) + installer = Bundler::Installer.install(Bundler.root, definition, :system => true, :inline => true) installer.post_install_messages.each do |name, message| Bundler.ui.info "Post-install message from #{name}:\n#{message}" end diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb index c4892ff186..46131ea8f6 100644 --- a/lib/bundler/installer.rb +++ b/lib/bundler/installer.rb @@ -212,7 +212,7 @@ module Bundler end def resolve_if_need(options) - if Bundler.default_lockfile.exist? && !options["update"] + if Bundler.default_lockfile.exist? && !options["update"] && !options[:inline] local = Bundler.ui.silence do begin tmpdef = Definition.build(Bundler.default_gemfile, Bundler.default_lockfile, nil) |