diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2024-05-22 19:47:23 +0200 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2024-05-24 15:02:29 +0000 |
| commit | ea7e3e7b789885fe01779b21749526e20d184e82 (patch) | |
| tree | 4d5817f1ffdf891a5a0a8f52531ef8d9d394f1ea /lib | |
| parent | 0f9781b5c1a17e7b57d3e23700896dce3bcf2404 (diff) | |
[rubygems/rubygems] Give better message when resolving because there's no lockfile
https://github.com/rubygems/rubygems/commit/4e048bc255
Diffstat (limited to 'lib')
| -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 |