diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-27 13:00:45 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-27 13:00:45 +0000 |
| commit | d9c32d62a06edf6bcfaf357e44173cefd92778ee (patch) | |
| tree | ba0a22afc2b02ca4c6eba226ff27c120595968a7 /lib/rubygems/request_set/gem_dependency_api.rb | |
| parent | b89e894399016def7979168d16eff9026012a710 (diff) | |
| download | ruby-d9c32d62a06edf6bcfaf357e44173cefd92778ee.tar.gz | |
* lib/rubygems: Update to RubyGems 2.4.6 and HEAD(800f2e6).
Fixed #1159, #1171, #1173 on rubygems/rubygems
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49774 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/request_set/gem_dependency_api.rb')
| -rw-r--r-- | lib/rubygems/request_set/gem_dependency_api.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/rubygems/request_set/gem_dependency_api.rb b/lib/rubygems/request_set/gem_dependency_api.rb index 9aad5ab5d3..6dd7892b4c 100644 --- a/lib/rubygems/request_set/gem_dependency_api.rb +++ b/lib/rubygems/request_set/gem_dependency_api.rb @@ -367,11 +367,11 @@ class Gem::RequestSet::GemDependencyAPI @dependencies[name] = if requirements.empty? and not source_set then - nil + Gem::Requirement.default elsif source_set then - '!' + Gem::Requirement.source_set else - requirements + Gem::Requirement.create requirements end return unless gem_platforms options @@ -601,7 +601,7 @@ Gem dependencies file #{@path} requires #{name} more than once. add_dependencies groups, [self_dep] add_dependencies groups, spec.runtime_dependencies - @dependencies[spec.name] = '!' + @dependencies[spec.name] = Gem::Requirement.source_set spec.dependencies.each do |dep| @dependencies[dep.name] = dep.requirement |