зеркало из https://github.com/github/ruby.git
[rubygems/rubygems] Improve wording of unmet dependencies warning
`trying to manually editing` doesn't seem quite grammatically correct. We could change it to `trying to manually edit` (is that a split infinitive?), but I don't think `trying to` adds much here so I've removed it instead so `editing` is the verb. For the list of dependencies, the wording before this commit seemed to reverse the dependency. "B, depended on A" sounds like B depends on A (or did in the past but doesn't anymore?), but that's not correct. I think there's a missing word: "B, depended on by A", but I find "B, dependency of A" a bit nicer. https://github.com/rubygems/rubygems/commit/49a31257e3
This commit is contained in:
Родитель
861d70e383
Коммит
728d2f808e
|
@ -110,12 +110,12 @@ module Bundler
|
|||
|
||||
warning = []
|
||||
warning << "Your lockfile doesn't include a valid resolution."
|
||||
warning << "You can fix this by regenerating your lockfile or trying to manually editing the bad locked gems to a version that satisfies all dependencies."
|
||||
warning << "You can fix this by regenerating your lockfile or manually editing the bad locked gems to a version that satisfies all dependencies."
|
||||
warning << "The unmet dependencies are:"
|
||||
|
||||
unmet_dependencies.each do |spec, unmet_spec_dependencies|
|
||||
unmet_spec_dependencies.each do |unmet_spec_dependency|
|
||||
warning << "* #{unmet_spec_dependency}, depended upon #{spec.full_name}, unsatisfied by #{@specs.find {|s| s.name == unmet_spec_dependency.name && !unmet_spec_dependency.matches_spec?(s.spec) }.full_name}"
|
||||
warning << "* #{unmet_spec_dependency}, dependency of #{spec.full_name}, unsatisfied by #{@specs.find {|s| s.name == unmet_spec_dependency.name && !unmet_spec_dependency.matches_spec?(s.spec) }.full_name}"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -22,9 +22,9 @@ RSpec.describe Bundler::ParallelInstaller do
|
|||
it "prints a warning" do
|
||||
expect(Bundler.ui).to receive(:warn).with(<<-W.strip)
|
||||
Your lockfile doesn't include a valid resolution.
|
||||
You can fix this by regenerating your lockfile or trying to manually editing the bad locked gems to a version that satisfies all dependencies.
|
||||
You can fix this by regenerating your lockfile or manually editing the bad locked gems to a version that satisfies all dependencies.
|
||||
The unmet dependencies are:
|
||||
* diff-lcs (< 1.4), depended upon cucumber-4.1.0, unsatisfied by diff-lcs-1.4.4
|
||||
* diff-lcs (< 1.4), dependency of cucumber-4.1.0, unsatisfied by diff-lcs-1.4.4
|
||||
W
|
||||
subject.check_for_unmet_dependencies
|
||||
end
|
||||
|
|
Загрузка…
Ссылка в новой задаче