diff --git a/Cargo.lock b/Cargo.lock index dffbf635..2871db12 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2922,7 +2922,7 @@ dependencies = [ "oma-refresh", "oma-repo-verify", "oma-topics", - "oma-utils 0.8.6", + "oma-utils 0.8.7", "ratatui", "reqwest", "rust-embed", @@ -2964,7 +2964,7 @@ dependencies = [ [[package]] name = "oma-console" -version = "0.17.5" +version = "0.18.0" dependencies = [ "ansi-to-tui", "console", @@ -3015,7 +3015,7 @@ dependencies = [ "indicatif", "md-5", "oma-console", - "oma-utils 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "oma-utils 0.8.6", "reqwest", "serde", "sha2", @@ -3055,7 +3055,7 @@ dependencies = [ [[package]] name = "oma-pm" -version = "0.35.0" +version = "0.36.0" dependencies = [ "ahash", "bon", @@ -3072,7 +3072,7 @@ dependencies = [ "oma-console", "oma-fetch", "oma-pm-operation-type", - "oma-utils 0.8.6", + "oma-utils 0.8.7", "serde", "strsim", "thiserror", @@ -3086,13 +3086,13 @@ name = "oma-pm-operation-type" version = "0.4.0" dependencies = [ "bon", - "oma-utils 0.8.6", + "oma-utils 0.8.7", "serde", ] [[package]] name = "oma-refresh" -version = "0.31.0" +version = "0.32.0" dependencies = [ "ahash", "aho-corasick", @@ -3110,7 +3110,7 @@ dependencies = [ "oma-fetch", "oma-repo-verify", "oma-topics", - "oma-utils 0.8.6", + "oma-utils 0.8.7", "once_cell", "sequoia-openpgp", "smallvec", @@ -3133,7 +3133,7 @@ dependencies = [ [[package]] name = "oma-topics" -version = "0.16.0" +version = "0.17.0" dependencies = [ "futures", "indexmap 2.6.0", @@ -3151,28 +3151,28 @@ dependencies = [ [[package]] name = "oma-utils" version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b695196f1f8db65c18205d315951a32914f6986cf4263beb9eee764c9185a3e5" dependencies = [ "logind-zbus", - "number_prefix", - "oma-console", "os-release", "thiserror", "tracing", "url-escape", - "zbus", ] [[package]] name = "oma-utils" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b695196f1f8db65c18205d315951a32914f6986cf4263beb9eee764c9185a3e5" +version = "0.8.7" dependencies = [ "logind-zbus", + "number_prefix", + "oma-console", "os-release", "thiserror", "tracing", "url-escape", + "zbus", ] [[package]] @@ -4420,9 +4420,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.31.4" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be" +checksum = "e3b5ae3f4f7d64646c46c4cae4e3f01d1c5d255c7406fdd7c7f999a94e488791" dependencies = [ "core-foundation-sys", "libc", diff --git a/oma-console/Cargo.toml b/oma-console/Cargo.toml index e09b9253..299896c6 100644 --- a/oma-console/Cargo.toml +++ b/oma-console/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oma-console" -version = "0.17.5" +version = "0.18.0" edition = "2021" description = "Console and terminal emulator handling library used by oma" license = "MIT" diff --git a/oma-pm/Cargo.toml b/oma-pm/Cargo.toml index 819c0e99..4d33d6ff 100644 --- a/oma-pm/Cargo.toml +++ b/oma-pm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oma-pm" -version = "0.35.0" +version = "0.36.0" edition = "2021" description = "APT package manager API abstraction library" license = "GPL-3.0-or-later" @@ -23,7 +23,7 @@ tokio = { version = "1.15", default-features = false, features = [ "fs", "rt-multi-thread", ] } -oma-console = { version = "^0.17.0", path = "../oma-console", default-features = false, features = [ +oma-console = { version = "^0.18.0", path = "../oma-console", default-features = false, features = [ "print", ] } fs4 = "0.10" @@ -41,7 +41,7 @@ serde = { version = "1", features = ["derive"] } [dev-dependencies] dashmap = "6" indicatif = "0.17" -oma-console = { version = "^0.17.0", path = "../oma-console", default-features = false, features = ["progress_bar_style"] } +oma-console = { version = "^0.18.0", path = "../oma-console", default-features = false, features = ["progress_bar_style"] } [features] aosc = [] diff --git a/oma-refresh/Cargo.toml b/oma-refresh/Cargo.toml index ffac799c..6d56e161 100644 --- a/oma-refresh/Cargo.toml +++ b/oma-refresh/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oma-refresh" -version = "0.31.0" +version = "0.32.0" edition = "2021" description = "APT repository refresh handler library" license = "GPL-3.0-or-later" @@ -18,7 +18,7 @@ oma-debcontrol = "0.3" sequoia-openpgp = { version = "1.20", default-features = false } anyhow = "1.0" chrono = { version = "0.4", features = ["unstable-locales"] } -oma-topics = { version = "^0.16.0", path = "../oma-topics", optional = true, default-features = false } +oma-topics = { version = "^0.17.0", path = "../oma-topics", optional = true, default-features = false } oma-utils = { version = "^0.8.0", path = "../oma-utils", features = ["dpkg"] } tracing ="0.1" smallvec = "1.1" @@ -29,7 +29,7 @@ aho-corasick = "1.1.3" # https://github.com/bytecodealliance/rustix/pull/1077 # rustix = { version = "0.38", features = ["fs"] } nix = { version = "0.29", features = ["fs"] } -sysinfo = "0.31" +sysinfo = "0.32" bon = "2.3" once_cell = "1.19" diff --git a/oma-refresh/src/db.rs b/oma-refresh/src/db.rs index e8714f68..430f4964 100644 --- a/oma-refresh/src/db.rs +++ b/oma-refresh/src/db.rs @@ -202,7 +202,7 @@ fn get_apt_update_lock(download_dir: &Path) -> Result<()> { if fl.l_pid != -1 { let mut sys = System::new(); - sys.refresh_processes(sysinfo::ProcessesToUpdate::All); + sys.refresh_processes(sysinfo::ProcessesToUpdate::All, true); let Some(process) = sys.process(Pid::from(fl.l_pid as usize)) else { return Err(RefreshError::SetLock(e)); }; diff --git a/oma-topics/Cargo.toml b/oma-topics/Cargo.toml index 52b32b64..534ac59c 100644 --- a/oma-topics/Cargo.toml +++ b/oma-topics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oma-topics" -version = "0.16.0" +version = "0.17.0" edition = "2021" description = "AOSC OS topic (testing) repository manager used by oma" license = "MIT" diff --git a/oma-utils/Cargo.toml b/oma-utils/Cargo.toml index 3564be92..7a97d944 100644 --- a/oma-utils/Cargo.toml +++ b/oma-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oma-utils" -version = "0.8.6" +version = "0.8.7" edition = "2021" description = "General system API and utilities used by oma" license = "MIT" @@ -11,7 +11,7 @@ license = "MIT" thiserror = "1.0" number_prefix = { version = "0.4", optional = true } os-release = "0.1" -oma-console = { version = "^0.17", path = "../oma-console", optional = true, default-features = false, features = [ +oma-console = { version = "^0.18", path = "../oma-console", optional = true, default-features = false, features = [ "print", ] } zbus = { version = "4.1", optional = true }