admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

feedback

Browse Source
This commit is contained in:
Tim Visher 2022-04-28 10:19:16 -04:00
parent 59649a288c
commit 8852208758
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Library/Homebrew/cleaner.rb
View File

@ -29,11 +29,29 @@ class Cleaner
[@f.bin, @f.sbin, @f.lib].each { |d| clean_dir(d) if d.exist? } [@f.bin, @f.sbin, @f.lib].each { |d| clean_dir(d) if d.exist? }
# Get rid of any info 'dir' files, so they don't conflict at the link stage # Get rid of any info 'dir' files, so they don't conflict at the link stage
#
# The 'dir' files come in at least 3 locations:
#
# 1. 'info/dir'
# 2. 'info/#{name}/dir'
# 3. 'info/#{arch}/dir'
#
# Of these 3 only 'info/#{name}/dir' is safe to keep since the rest will
# conflict with other formulae because they use a shared location.
#
# See [cleaner: recursively delete info `dir`s by gromgit · Pull Request
# #11597][1], [emacs 28.1 bottle does not contain `dir` file · Issue
# #100190][2], and [Keep `info/#{f.name}/dir` files in cleaner by
# timvisher][3] for more info.
#
# [1]: https://github.com/Homebrew/brew/pull/11597
# [2]: https://github.com/Homebrew/homebrew-core/issues/100190
# [3]: https://github.com/Homebrew/brew/pull/13215
Dir.glob(@f.info/"**/dir").each do |f| Dir.glob(@f.info/"**/dir").each do |f|
info_dir_file = Pathname(f) info_dir_file = Pathname(f)
next if info_dir_file == Pathname("#{@f.info}/#{@f.name}/dir")
next if @f.skip_clean?(info_dir_file)
next unless info_dir_file.file? next unless info_dir_file.file?
next if info_dir_file == @f.info/@f.name/"dir"
next if @f.skip_clean?(info_dir_file)
observe_file_removal info_dir_file observe_file_removal info_dir_file
end end

8
Library/Homebrew/test/cleaner_spec.rb
View File

@ -140,11 +140,11 @@ describe Cleaner do
it "removes 'info/**/dir' files except for 'info/<name>/dir'" do it "removes 'info/**/dir' files except for 'info/<name>/dir'" do
file = f.info/"dir" file = f.info/"dir"
arch_file = f.info/"i686-elf/dir" arch_file = f.info/"i686-elf/dir"
name_file = f.info/"#{f.name}/dir" name_file = f.info/f.name/"dir"
f.info.mkpath file.dirname.mkpath
(f.info/"i686-elf").mkpath arch_file.dirname.mkpath
(f.info/ + f.name.to_s).mkpath name_file.dirname.mkpath
touch file touch file
touch arch_file touch arch_file