diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-26 20:24:51 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-26 20:24:51 +0000 |
| commit | e487a7f53cffbadf0bf15ff169c9cb5898503250 (patch) | |
| tree | eaa80eb4ced6fcdcc8b327d1cc5e47f66703fd1b /lib/rubygems/dependency_installer.rb | |
| parent | cddd93a57568966b416e300529bdffc0c7e87b51 (diff) | |
| download | ruby-e487a7f53cffbadf0bf15ff169c9cb5898503250.tar.gz | |
* lib/rubygems: Import RubyGems 2.1.0 Release Candidate
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/dependency_installer.rb')
| -rw-r--r-- | lib/rubygems/dependency_installer.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb index 2523d1b2ae..e7c489a759 100644 --- a/lib/rubygems/dependency_installer.rb +++ b/lib/rubygems/dependency_installer.rb @@ -5,8 +5,7 @@ require 'rubygems/package' require 'rubygems/installer' require 'rubygems/spec_fetcher' require 'rubygems/user_interaction' -require 'rubygems/source/local' -require 'rubygems/source/specific_file' +require 'rubygems/source' require 'rubygems/available_set' ## @@ -251,7 +250,6 @@ class Gem::DependencyInstaller def find_spec_by_name_and_version gem_name, version = Gem::Requirement.default, prerelease = false - set = Gem::AvailableSet.new if consider_local? @@ -269,7 +267,6 @@ class Gem::DependencyInstaller if set.empty? dep = Gem::Dependency.new gem_name, version - # HACK Dependency objects should be immutable dep.prerelease = true if prerelease set = find_gems_with_sources(dep) |