Skip to content

Commit 231e2d9

Browse files
committed
feat(oma-utils,oma-pm): zbus use tokio feature only
1 parent 0278fd2 commit 231e2d9

File tree

5 files changed

+16
-162
lines changed

5 files changed

+16
-162
lines changed

Cargo.lock

Lines changed: 8 additions & 155 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

oma-pm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ tokio = { version = "1.15", default-features = false, features = [
2626
fs4 = "0.13"
2727
tracing = "0.1"
2828
oma-pm-operation-type = { version = "0.10", path = "../oma-pm-operation-type" }
29-
zbus = { version = "5.1", features = ["tokio"] }
29+
zbus = { version = "5.1", default-features = false, features = ["tokio"] }
3030
cxx = "1.0.121"
3131
ahash = "0.8.11"
3232
bon = "3"

oma-pm/src/apt.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ use tracing::debug;
3333
use tracing::warn;
3434

3535
pub use oma_pm_operation_type::*;
36-
use zbus::Connection;
36+
use oma_utils::zbus::Connection;
3737

3838
use crate::{
3939
commit::{CommitConfig, CustomDownloadMessage, DoInstall},

oma-pm/src/progress.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use crate::{apt::AptConfig, dbus::change_status};
22
use oma_apt::progress::DynInstallProgress;
3+
use oma_utils::zbus;
34
use once_cell::sync::OnceCell;
45
use tokio::runtime::Runtime;
56
use zbus::Connection;

oma-utils/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ license = "MIT"
1111
thiserror = "2"
1212
number_prefix = { version = "0.4", optional = true }
1313
os-release = "0.1"
14-
zbus = { version = "5.1", optional = true }
14+
zbus = { version = "5.1", optional = true, default-features = false, features = ["tokio"] }
1515
url-escape = { version = "0.1", optional = true }
1616
tracing = "0.1"
17-
logind-zbus = "5.1"
17+
logind-zbus = { version = "5.1", optional = true, default-features = false, features = ["tokio"], package = "logind-zbus-tokio" }
1818

1919
[features]
2020
dpkg = []
21-
human-bytes = ["number_prefix"]
22-
dbus = ["zbus"]
23-
url-no-escape = ["url-escape"]
21+
human-bytes = ["dep:number_prefix"]
22+
dbus = ["dep:zbus", "dep:logind-zbus"]
23+
url-no-escape = ["dep:url-escape"]

0 commit comments

Comments
 (0)