From 48db5eff25ace8c6d433a4d3fdda0da3d936bc94 Mon Sep 17 00:00:00 2001 From: Tim Visher Date: Thu, 28 Apr 2022 00:09:18 -0400 Subject: [PATCH] lint --- Library/Homebrew/cleaner.rb | 4 +++- Library/Homebrew/test/cleaner_spec.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cleaner.rb b/Library/Homebrew/cleaner.rb index 480054bda5..865810e1bd 100644 --- a/Library/Homebrew/cleaner.rb +++ b/Library/Homebrew/cleaner.rb @@ -31,7 +31,9 @@ class Cleaner # Get rid of any info 'dir' files, so they don't conflict at the link stage Dir.glob(@f.info/"**/dir").each do |f| info_dir_file = Pathname(f) - observe_file_removal info_dir_file if info_dir_file.file? && info_dir_file != Pathname("#{@f.info}/#{@f.name}/dir") && !@f.skip_clean?(info_dir_file) + next if info_dir_file == Pathname("#{@f.info}/#{@f.name}/dir") + + observe_file_removal info_dir_file if info_dir_file.file? && !@f.skip_clean?(info_dir_file) end rewrite_shebangs diff --git a/Library/Homebrew/test/cleaner_spec.rb b/Library/Homebrew/test/cleaner_spec.rb index 3071639dac..ed584ea3f4 100644 --- a/Library/Homebrew/test/cleaner_spec.rb +++ b/Library/Homebrew/test/cleaner_spec.rb @@ -144,7 +144,7 @@ describe Cleaner do f.info.mkpath (f.info/"i686-elf").mkpath - (f.info/"#{f.name}").mkpath + (f.info/ + f.name.to_s).mkpath touch file touch arch_file