diff options
| -rw-r--r-- | lib/bundler/definition.rb | 9 | ||||
| -rw-r--r-- | lib/bundler/installer.rb | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 22070b6b17..bc526fa3e3 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -310,7 +310,12 @@ module Bundler end end else - Bundler.ui.debug "Found changes from the lockfile, re-resolving dependencies because #{change_reason}" + if lockfile_exists? + Bundler.ui.debug "Found changes from the lockfile, re-resolving dependencies because #{change_reason}" + else + Bundler.ui.debug "Resolving dependencies because there's no lockfile" + end + start_resolution end end @@ -483,6 +488,8 @@ module Bundler private :sources def nothing_changed? + return false unless lockfile_exists? + !@source_changes && !@dependency_changes && !@new_platform && diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb index 406c7474d5..433914d644 100644 --- a/lib/bundler/installer.rb +++ b/lib/bundler/installer.rb @@ -237,7 +237,7 @@ module Bundler def resolve_if_needed(options) @definition.resolution_mode = options - if !options["force"] && !Bundler.settings[:inline] && Bundler.default_lockfile.file? && @definition.no_resolve_needed? && !@definition.missing_specs? + if !options["force"] && !Bundler.settings[:inline] && @definition.no_resolve_needed? && !@definition.missing_specs? false else @definition.setup_sources_for_resolve |