diff options
| author | David Rodriguez <deivid.rodriguez@riseup.net> | 2021-10-14 12:03:57 +0200 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-10-25 20:48:51 +0900 |
| commit | b4a43e4f577807303b0e465a27eefff2793fe3ea (patch) | |
| tree | 034742921d7ba4295fa37b1e302f1fe59ded99cf /lib | |
| parent | 00412be20469407cd6da813eab6bfa5b63cd945f (diff) | |
[rubygems/rubygems] Show proper error when previous installation of gem can't be deleted
Instead of showing the bug report template with an error at a random
place.
https://github.com/rubygems/rubygems/commit/882ad3ab57
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/errors.rb | 4 | ||||
| -rw-r--r-- | lib/bundler/rubygems_gem_installer.rb | 15 |
2 files changed, 17 insertions, 2 deletions
diff --git a/lib/bundler/errors.rb b/lib/bundler/errors.rb index 59898cd252..9ad7460e58 100644 --- a/lib/bundler/errors.rb +++ b/lib/bundler/errors.rb @@ -79,6 +79,10 @@ module Bundler case @permission_type when :create "executable permissions for all parent directories and write permissions for `#{parent_folder}`" + when :delete + permissions = "executable permissions for all parent directories and write permissions for `#{parent_folder}`" + permissions += ", and the same thing for all subdirectories inside #{@path}" if File.directory?(@path) + permissions else "#{@permission_type} permissions for that path" end diff --git a/lib/bundler/rubygems_gem_installer.rb b/lib/bundler/rubygems_gem_installer.rb index 39c9031c4a..bb9f1cb3f5 100644 --- a/lib/bundler/rubygems_gem_installer.rb +++ b/lib/bundler/rubygems_gem_installer.rb @@ -16,8 +16,8 @@ module Bundler spec.loaded_from = spec_file # Completely remove any previous gem files - FileUtils.rm_rf gem_dir - FileUtils.rm_rf spec.extension_dir + strict_rm_rf gem_dir + strict_rm_rf spec.extension_dir SharedHelpers.filesystem_access(gem_dir, :create) do FileUtils.mkdir_p gem_dir, :mode => 0o755 @@ -92,6 +92,17 @@ module Bundler private + def strict_rm_rf(dir) + # FileUtils.rm_rf should probably rise in case of permission issues like + # `rm -rf` does. However, it fails to delete the folder silently due to + # https://github.com/ruby/fileutils/issues/57. It should probably be fixed + # inside `fileutils` but for now I`m checking whether the folder was + # removed after it completes, and raising otherwise. + FileUtils.rm_rf dir + + raise PermissionError.new(dir, :delete) if File.directory?(dir) + end + def validate_bundler_checksum(checksum) return true if Bundler.settings[:disable_checksum_validation] return true unless checksum |