diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-14 03:30:02 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-14 03:30:02 +0000 |
commit | 4de117a61517e839f2c45eaf45d56fc243d6d5b2 (patch) | |
tree | 7cb5af7a7eb513e5dddf5e343746b1611e628387 /lib/rubygems/exceptions.rb | |
parent | e548c09d429a5136285ea81aed418685359ed124 (diff) |
* lib/rubygems: Update to RubyGems 2.4.1 master(713ab65)
Complete history at:
https://github.com/rubygems/rubygems/blob/master/History.txt#L3-L216
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/exceptions.rb')
-rw-r--r-- | lib/rubygems/exceptions.rb | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/lib/rubygems/exceptions.rb b/lib/rubygems/exceptions.rb index 6bd50eca2c..2a9875cd24 100644 --- a/lib/rubygems/exceptions.rb +++ b/lib/rubygems/exceptions.rb @@ -27,7 +27,7 @@ class Gem::DependencyRemovalException < Gem::Exception; end # toplevel. Indicates which dependencies were incompatible through #conflict # and #conflicting_dependencies -class Gem::DependencyResolutionError < Gem::Exception +class Gem::DependencyResolutionError < Gem::DependencyError attr_reader :conflict @@ -214,7 +214,7 @@ end # Raised by Resolver when a dependency requests a gem for which # there is no spec. -class Gem::UnsatisfiableDependencyError < Gem::Exception +class Gem::UnsatisfiableDependencyError < Gem::DependencyError ## # The unsatisfiable dependency. This is a @@ -223,6 +223,11 @@ class Gem::UnsatisfiableDependencyError < Gem::Exception attr_reader :dependency ## + # Errors encountered which may have contributed to this exception + + attr_accessor :errors + + ## # Creates a new UnsatisfiableDependencyError for the unsatisfiable # Gem::Resolver::DependencyRequest +dep+ @@ -239,6 +244,21 @@ class Gem::UnsatisfiableDependencyError < Gem::Exception end @dependency = dep + @errors = [] + end + + ## + # The name of the unresolved dependency + + def name + @dependency.name + end + + ## + # The Requirement of the unresolved dependency (not Version). + + def version + @dependency.requirement end end |