Merge pull request #15027 from reitermarkus/bom-retry

Remove explicit error for empty BOM retry.
This commit is contained in:
Mike McQuaid 2023-03-21 12:26:31 +00:00 committed by GitHub
commit 121d91fdab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -132,20 +132,16 @@ module UnpackStrategy
sig { override.params(unpack_dir: Pathname, basename: Pathname, verbose: T::Boolean).returns(T.untyped) }
def extract_to_dir(unpack_dir, basename:, verbose:)
bom = begin
tries ||= 10
tries ||= 3
path.bom
rescue Bom::EmptyError => e
raise "#{e} No retries left." if (tries -= 1).zero?
raise e if (tries -= 1).zero?
sleep 1
retry
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|
bomfile.close