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

Remove explicit error for empty BOM retry.

Browse Source
This commit is contained in:
Markus Reiter 2023-03-21 00:39:22 +01:00
parent ffa7ee0112
commit c6a5d79ef9
No known key found for this signature in database
GPG Key ID: 245293B51702655B
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/unpack_strategy/dmg.rb
View File

@ -132,20 +132,16 @@ module UnpackStrategy
sig { override.params(unpack_dir: Pathname, basename: Pathname, verbose: T::Boolean).returns(T.untyped) } sig { override.params(unpack_dir: Pathname, basename: Pathname, verbose: T::Boolean).returns(T.untyped) }
def extract_to_dir(unpack_dir, basename:, verbose:) def extract_to_dir(unpack_dir, basename:, verbose:)
bom = begin bom = begin
tries ||= 10 tries ||= 3
path.bom path.bom
rescue Bom::EmptyError => e rescue Bom::EmptyError => e
raise "#{e} No retries left." if (tries -= 1).zero? raise e if (tries -= 1).zero?
sleep 1 sleep 1
retry retry
end end
# TODO: Remove this if we actually ever hit this, i.e. if we actually found
# some files after waiting longer for the DMG to be mounted.
raise "BOM for path '#{path}' was empty but retrying for #{10 - tries} seconds helped." if tries != 10
Tempfile.open(["", ".bom"]) do |bomfile| Tempfile.open(["", ".bom"]) do |bomfile|
bomfile.close bomfile.close