Skip to content
This repository was archived by the owner on Apr 14, 2021. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions lib/bundler/cli/install.rb
Original file line number Diff line number Diff line change
Expand Up @@ -201,18 +201,6 @@ def normalize_settings
options[:force] = options[:redownload]
end

def warn_ambiguous_gems
# TODO: remove this when we drop Bundler 1.x support
Installer.ambiguous_gems.to_a.each do |name, installed_from_uri, *also_found_in_uris|
Bundler.ui.warn "Warning: the gem '#{name}' was found in multiple sources."
Bundler.ui.warn "Installed from: #{installed_from_uri}"
Bundler.ui.warn "Also found in:"
also_found_in_uris.each {|uri| Bundler.ui.warn " * #{uri}" }
Bundler.ui.warn "You should add a source requirement to restrict this gem to your preferred source."
Bundler.ui.warn "For example:"
Bundler.ui.warn " gem '#{name}', :source => '#{installed_from_uri}'"
Bundler.ui.warn "Then uninstall the gem '#{name}' (or delete all bundled gems) and then install again."
end
end
def warn_ambiguous_gems; end
end
end
7 changes: 0 additions & 7 deletions lib/bundler/definition.rb
Original file line number Diff line number Diff line change
Expand Up @@ -759,8 +759,6 @@ def converge_locked_specs
end
end

unlock_source_unlocks_spec = Bundler.feature_flag.unlock_source_unlocks_spec?

converged = []
@locked_specs.each do |s|
# Replace the locked dependency's source with the equivalent source from the Gemfile
Expand All @@ -772,11 +770,6 @@ def converge_locked_specs
next if s.source.nil?
next if @unlock[:sources].include?(s.source.name)

# XXX This is a backwards-compatibility fix to preserve the ability to
# unlock a single gem by passing its name via `--source`. See issue #3759
# TODO: delete in Bundler 2
next if unlock_source_unlocks_spec && @unlock[:sources].include?(s.name)

# If the spec is from a path source and it doesn't exist anymore
# then we unlock it.

Expand Down
4 changes: 0 additions & 4 deletions lib/bundler/installer/parallel_installer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@ def initialize(installer, all_specs, size, standalone, force)
end

def call
# Since `autoload` has the potential for threading issues on 1.8.7
# TODO: remove in bundler 2.0
require "bundler/gem_remote_fetcher" if RUBY_VERSION < "1.9"

check_for_corrupt_lockfile

if @size > 1
Expand Down
4 changes: 0 additions & 4 deletions spec/bundler/bundler_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -386,10 +386,6 @@ def clear_cached_requires_sudo
if Bundler.respond_to?(:remove_instance_variable)
Bundler.remove_instance_variable(:@requires_sudo_ran)
Bundler.remove_instance_variable(:@requires_sudo)
else
# TODO: Remove these code when Bundler drops Ruby 1.8.7 support
Bundler.send(:remove_instance_variable, :@requires_sudo_ran)
Bundler.send(:remove_instance_variable, :@requires_sudo)
end
end
context "writable paths" do
Expand Down