actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-04-20 12:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Unmatched checksum error (#1585)

Browse source 
Fixed #1575

Always consume the stream if a `data_verifier` is provided in
`binstalk_download::Download`

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2024-01-21 16:50:20 +10:00 • committed by GitHub
parent 7f70a4e8ee
commit 01ddf00b54
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
crates/binstalk-downloader/src/download.rs
View file

@ -201,18 +201,17 @@ impl Download<'_> {
debug!("Downloading and extracting then in-memory processing"); debug!("Downloading and extracting then in-memory processing");
match extract_tar_based_stream_and_visit(&mut stream, fmt, visitor).await { let res = extract_tar_based_stream_and_visit(&mut stream, fmt, visitor).await;
Ok(()) => {
debug!("Download, extraction and in-memory procession OK");
Ok(())
}
Err(err) => {
if has_data_verifier { if has_data_verifier {
consume_stream(&mut stream).await; consume_stream(&mut stream).await;
} }
Err(err)
} if res.is_ok() {
debug!("Download, extraction and in-memory procession OK");
} }
res
} }
/// Download a file from the provided URL and extract it to the provided path. /// Download a file from the provided URL and extract it to the provided path.
@ -242,18 +241,15 @@ impl Download<'_> {
PkgFmtDecomposed::Zip => extract_zip(&mut stream, path).await, PkgFmtDecomposed::Zip => extract_zip(&mut stream, path).await,
}; };
match res {
Ok(extracted_files) => {
debug!("Download OK, extracted to: '{}'", path.display());
Ok(extracted_files)
}
Err(err) => {
if has_data_verifier { if has_data_verifier {
consume_stream(&mut stream).await; consume_stream(&mut stream).await;
} }
Err(err)
} if res.is_ok() {
debug!("Download OK, extracted to: '{}'", path.display());
} }
res
} }
inner(self, fmt, path.as_ref()).await inner(self, fmt, path.as_ref()).await