diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-22 02:52:35 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-22 02:52:35 +0000 |
| commit | b551e8c8b36766651be4e782e09e3b02e7d14a10 (patch) | |
| tree | e164a1ef908bd4451568abf05b688f1593915b81 /lib/rubygems/uninstaller.rb | |
| parent | 65544f575b25b18dc27f9364f973556ddb48538f (diff) | |
| download | ruby-b551e8c8b36766651be4e782e09e3b02e7d14a10.tar.gz | |
* lib/rubygems: update to 1.3.6.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26728 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/uninstaller.rb')
| -rw-r--r-- | lib/rubygems/uninstaller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/rubygems/uninstaller.rb b/lib/rubygems/uninstaller.rb index 4bb777a2a2..1dea232634 100644 --- a/lib/rubygems/uninstaller.rb +++ b/lib/rubygems/uninstaller.rb @@ -202,7 +202,7 @@ class Gem::Uninstaller spec.name, spec.version, spec.original_platform].join '-' spec_dir = File.join spec.installation_path, 'specifications' - gemspec = File.join spec_dir, "#{spec.full_name}.gemspec" + gemspec = File.join spec_dir, spec.spec_name unless File.exist? gemspec then gemspec = File.join spec_dir, "#{original_platform_name}.gemspec" @@ -211,7 +211,7 @@ class Gem::Uninstaller FileUtils.rm_rf gemspec cache_dir = File.join spec.installation_path, 'cache' - gem = File.join cache_dir, "#{spec.full_name}.gem" + gem = File.join cache_dir, spec.file_name unless File.exist? gem then gem = File.join cache_dir, "#{original_platform_name}.gem" @@ -251,7 +251,7 @@ class Gem::Uninstaller spec.dependent_gems.each do |gem,dep,satlist| msg << ("#{gem.name}-#{gem.version} depends on " + - "[#{dep.name} (#{dep.version_requirements})]") + "[#{dep.name} (#{dep.requirement})]") end msg << 'If you remove this gems, one or more dependencies will not be met.' msg << 'Continue with Uninstall?' |