From 28a80a6ebf322bcd7def1e671f77eab9d62319ae Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Wed, 27 Mar 2024 06:26:32 +0000 Subject: [PATCH] Avoid `writable_real?` --- Library/Homebrew/dev-cmd/unpack.rb | 2 +- Library/Homebrew/diagnostic.rb | 4 ++-- Library/Homebrew/extend/os/mac/keg.rb | 2 +- Library/Homebrew/extend/pathname.rb | 2 +- Library/Homebrew/language/python.rb | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/dev-cmd/unpack.rb b/Library/Homebrew/dev-cmd/unpack.rb index 1fa6afceeb..dcf50f2899 100644 --- a/Library/Homebrew/dev-cmd/unpack.rb +++ b/Library/Homebrew/dev-cmd/unpack.rb @@ -43,7 +43,7 @@ module Homebrew unpack_dir = Pathname.pwd end - odie "Cannot write to #{unpack_dir}" unless unpack_dir.writable_real? + odie "Cannot write to #{unpack_dir}" unless unpack_dir.writable? formulae.each do |f| stage_dir = unpack_dir/"#{f.name}-#{f.version}" diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index 5c6d81e605..e0841e73bf 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -344,7 +344,7 @@ module Homebrew alias generic_check_tmpdir_sticky_bit check_tmpdir_sticky_bit def check_exist_directories - return if HOMEBREW_PREFIX.writable_real? + return if HOMEBREW_PREFIX.writable? not_exist_dirs = Keg::MUST_EXIST_DIRECTORIES.reject(&:exist?) return if not_exist_dirs.empty? @@ -362,7 +362,7 @@ module Homebrew def check_access_directories not_writable_dirs = Keg::MUST_BE_WRITABLE_DIRECTORIES.select(&:exist?) - .reject(&:writable_real?) + .reject(&:writable?) return if not_writable_dirs.empty? <<~EOS diff --git a/Library/Homebrew/extend/os/mac/keg.rb b/Library/Homebrew/extend/os/mac/keg.rb index 097e58f65e..76a1d9292d 100644 --- a/Library/Homebrew/extend/os/mac/keg.rb +++ b/Library/Homebrew/extend/os/mac/keg.rb @@ -82,7 +82,7 @@ class Keg files = result.stdout.lines.map { |f| Pathname(f.chomp) } saved_perms = {} files.each do |f| - unless f.writable_real? + unless f.writable? saved_perms[f] = f.stat.mode FileUtils.chmod "u+rw", f.to_path end diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb index 5f363c088d..e7fd27f2b2 100644 --- a/Library/Homebrew/extend/pathname.rb +++ b/Library/Homebrew/extend/pathname.rb @@ -333,7 +333,7 @@ class Pathname # @private def ensure_writable saved_perms = nil - unless writable_real? + unless writable? saved_perms = stat.mode FileUtils.chmod "u+rw", to_path end diff --git a/Library/Homebrew/language/python.rb b/Library/Homebrew/language/python.rb index d9bb9bb019..e5705ef66a 100644 --- a/Library/Homebrew/language/python.rb +++ b/Library/Homebrew/language/python.rb @@ -50,7 +50,7 @@ module Language def self.reads_brewed_pth_files?(python) return false unless homebrew_site_packages(python).directory? - return false unless homebrew_site_packages(python).writable_real? + return false unless homebrew_site_packages(python).writable? probe_file = homebrew_site_packages(python)/"homebrew-pth-probe.pth" begin