diff --git a/Cargo.lock b/Cargo.lock index 2d3558c91..c828890e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -702,8 +702,8 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "pkgar" -version = "0.2.2" -source = "git+https://gitlab.redox-os.org/redox-os/pkgar.git#ee2bcb2af97eba496ebd8eaf44f5acbed452c4ec" +version = "0.2.3" +source = "git+https://gitlab.redox-os.org/redox-os/pkgar.git#a7b65343e856d4b16f9e788a7c49fffb05822dab" dependencies = [ "blake3", "bytemuck", @@ -715,8 +715,8 @@ dependencies = [ [[package]] name = "pkgar-core" -version = "0.2.2" -source = "git+https://gitlab.redox-os.org/redox-os/pkgar.git#ee2bcb2af97eba496ebd8eaf44f5acbed452c4ec" +version = "0.2.3" +source = "git+https://gitlab.redox-os.org/redox-os/pkgar.git#a7b65343e856d4b16f9e788a7c49fffb05822dab" dependencies = [ "bitflags", "blake3", @@ -726,8 +726,8 @@ dependencies = [ [[package]] name = "pkgar-keys" -version = "0.2.2" -source = "git+https://gitlab.redox-os.org/redox-os/pkgar.git#ee2bcb2af97eba496ebd8eaf44f5acbed452c4ec" +version = "0.2.3" +source = "git+https://gitlab.redox-os.org/redox-os/pkgar.git#a7b65343e856d4b16f9e788a7c49fffb05822dab" dependencies = [ "hex", "pkgar-core", @@ -856,8 +856,8 @@ dependencies = [ [[package]] name = "redox-pkg" -version = "0.3.1" -source = "git+https://gitlab.redox-os.org/redox-os/pkgutils.git#1250a77bf160a79492cf1943b3b2533b39ebba73" +version = "0.3.2" +source = "git+https://gitlab.redox-os.org/redox-os/pkgutils.git#5de8f295fdce141aa76ddba6f787b5589db18783" dependencies = [ "hex", "serde", @@ -895,7 +895,7 @@ dependencies = [ [[package]] name = "redox_installer" version = "0.2.42" -source = "git+https://gitlab.redox-os.org/redox-os/installer.git#d7409a2cc6ebd44eab9f0c57551bb0b2798d21e1" +source = "git+https://gitlab.redox-os.org/redox-os/installer.git#b5a11310e1ac915494efea6d18e242966da74f3f" dependencies = [ "anyhow", "arg_parser", @@ -918,7 +918,7 @@ dependencies = [ [[package]] name = "redoxer" version = "0.2.63" -source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#bf7488c52d63f5be2aac2bf16fd74dfb5be4baaa" +source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#5c74b7d78113bba19905225fe1a5d11adcc5c5a3" dependencies = [ "anyhow", "dirs", diff --git a/src/cook/fetch.rs b/src/cook/fetch.rs index a92c05ea6..f402617cb 100644 --- a/src/cook/fetch.rs +++ b/src/cook/fetch.rs @@ -737,7 +737,7 @@ pub fn fetch_remote( let toml_file = File::create(&tmp_toml).map_err(wrap_io_err!(tmp_toml, "Creating file"))?; let mut writer = DownloadBackendWriter::ToFile(toml_file); - manager.download(&format!("{}.toml", source_name), None, &mut writer)?; + manager.download(&format!("{}.toml", source_name), None, None, &mut writer)?; read_source_toml(&tmp_toml)? }; @@ -750,6 +750,7 @@ pub fn fetch_remote( manager.download( &format!("{}.pkgar", source_name), Some(pkg_toml.network_size), + None, &mut writer, )?; rename(&tmp_pkgar, &source_pkgar)?; diff --git a/src/cook/fetch_repo.rs b/src/cook/fetch_repo.rs index 98bf89ea2..e80672fea 100644 --- a/src/cook/fetch_repo.rs +++ b/src/cook/fetch_repo.rs @@ -8,7 +8,7 @@ use std::{ use crate::cook::fs; use pkg::{ - PackageName, RemotePackage, RepoManager, Repository, + PackageName, RepoManager, Repository, callback::{Callback, PlainCallback, SilentCallback}, net_backend::{CurlBackend, DownloadBackend}, }; @@ -220,9 +220,4 @@ impl Callback for PlainPtyCallback { self.download_file = None; } } - - fn install_extract(&mut self, remote_pkg: &RemotePackage) { - let _ = writeln!(&self.pty, "Extracting {}...", remote_pkg.package.name); - self.flush(); - } }