kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[rubygems/rubygems] Add writable check for cache dir

Browse source 
Sometimes "install_dir/cache" directory is not writable although "install_dir" is writable.

665221cb69
This commit is contained in:
xndcn 2020-08-04 13:25:59 +08:00 • committed by Hiroshi SHIBATA
parent c55b5f1062
commit ac3f80a58e
Notes: git 2020-09-28 14:54:53 +09:00
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/rubygems/remote_fetcher.rb
View file

@ -114,11 +114,12 @@ class Gem::RemoteFetcher
# always replaced. # always replaced.
def download(spec, source_uri, install_dir = Gem.dir) def download(spec, source_uri, install_dir = Gem.dir)
install_cache_dir = File.join install_dir, "cache"
cache_dir = cache_dir =
if Dir.pwd == install_dir # see fetch_command if Dir.pwd == install_dir # see fetch_command
install_dir install_dir
elsif File.writable? install_dir elsif File.writable?(install_cache_dir) || (File.writable?(install_dir) && (not File.exist?(install_cache_dir)))
File.join install_dir, "cache" install_cache_dir
else else
File.join Gem.user_dir, "cache" File.join Gem.user_dir, "cache"
end end

3
test/rubygems/test_gem_remote_fetcher.rb
View file

@ -321,6 +321,8 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
local_path = File.join @tempdir, @a1.file_name local_path = File.join @tempdir, @a1.file_name
inst = nil inst = nil
FileUtils.chmod 0555, @a1.cache_dir FileUtils.chmod 0555, @a1.cache_dir
FileUtils.mkdir_p File.join(Gem.user_dir, "cache") rescue nil
FileUtils.chmod 0555, File.join(Gem.user_dir, "cache")
Dir.chdir @tempdir do Dir.chdir @tempdir do
inst = Gem::RemoteFetcher.fetcher inst = Gem::RemoteFetcher.fetcher
@ -329,6 +331,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
assert_equal(File.join(@tempdir, @a1.file_name), assert_equal(File.join(@tempdir, @a1.file_name),
inst.download(@a1, local_path)) inst.download(@a1, local_path))
ensure ensure
FileUtils.chmod 0755, File.join(Gem.user_dir, "cache")
FileUtils.chmod 0755, @a1.cache_dir FileUtils.chmod 0755, @a1.cache_dir
end end