mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix_homepage

Browse Source
This commit is contained in:
Marius Kleiner 2025-03-31 09:55:17 +02:00 committed by GitHub
commit 24e849b75e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/diagnostic.rb
View File

@ -204,6 +204,7 @@ module Homebrew
# with a short description of the software they come with. # with a short description of the software they come with.
allow_list = [ allow_list = [
"libfuse.2.dylib", # MacFuse "libfuse.2.dylib", # MacFuse
"libfuse3.*.dylib", # MacFuse
"libfuse_ino64.2.dylib", # MacFuse "libfuse_ino64.2.dylib", # MacFuse
"libmacfuse_i32.2.dylib", # OSXFuse MacFuse compatibility layer "libmacfuse_i32.2.dylib", # OSXFuse MacFuse compatibility layer
"libmacfuse_i64.2.dylib", # OSXFuse MacFuse compatibility layer "libmacfuse_i64.2.dylib", # OSXFuse MacFuse compatibility layer
@ -261,6 +262,7 @@ module Homebrew
# with a short description of the software they come with. # with a short description of the software they come with.
allow_list = [ allow_list = [
"fuse.pc", # OSXFuse/MacFuse "fuse.pc", # OSXFuse/MacFuse
"fuse3.pc", # OSXFuse/MacFuse
"macfuse.pc", # OSXFuse MacFuse compatibility layer "macfuse.pc", # OSXFuse MacFuse compatibility layer
"osxfuse.pc", # OSXFuse "osxfuse.pc", # OSXFuse
"libntfs-3g.pc", # NTFS-3G "libntfs-3g.pc", # NTFS-3G
@ -301,6 +303,7 @@ module Homebrew
allow_list = [ allow_list = [
"fuse.h", # MacFuse "fuse.h", # MacFuse
"fuse/**/*.h", # MacFuse "fuse/**/*.h", # MacFuse
"fuse3/**/*.h", # MacFuse
"macfuse/**/*.h", # OSXFuse MacFuse compatibility layer "macfuse/**/*.h", # OSXFuse MacFuse compatibility layer
"osxfuse/**/*.h", # OSXFuse "osxfuse/**/*.h", # OSXFuse
"ntfs/**/*.h", # NTFS-3G "ntfs/**/*.h", # NTFS-3G

6
Library/Homebrew/test/bundle/whalebrew_installer_spec.rb
View File

@ -10,6 +10,11 @@ RSpec.describe Homebrew::Bundle::WhalebrewInstaller do
end end
describe ".installed_images" do describe ".installed_images" do
before do
described_class.reset!
Homebrew::Bundle::WhalebrewDumper.reset!
end
it "shells out" do it "shells out" do
expect { described_class.installed_images }.not_to raise_error expect { described_class.installed_images }.not_to raise_error
end end
@ -55,6 +60,7 @@ RSpec.describe Homebrew::Bundle::WhalebrewInstaller do
context "when whalebrew is installed" do context "when whalebrew is installed" do
before do before do
described_class.reset! described_class.reset!
Homebrew::Bundle::WhalebrewDumper.reset!
allow(Homebrew::Bundle).to receive(:whalebrew_installed?).and_return(true) allow(Homebrew::Bundle).to receive(:whalebrew_installed?).and_return(true)
allow(Homebrew::Bundle).to receive(:system).with("whalebrew", "install", "whalebrew/wget", verbose: false) allow(Homebrew::Bundle).to receive(:system).with("whalebrew", "install", "whalebrew/wget", verbose: false)
.and_return(true) .and_return(true)