From dc14a43f9097bafae71c8d0f30bf5bee70960304 Mon Sep 17 00:00:00 2001 From: innocentzero Date: Thu, 11 Apr 2024 22:12:17 +0530 Subject: [PATCH] fix(fedora): Package install, update and query Signed-off-by: innocentzero --- crates/pacdef_core/src/backend/actual/fedora.rs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/crates/pacdef_core/src/backend/actual/fedora.rs b/crates/pacdef_core/src/backend/actual/fedora.rs index d249030..e8323e2 100644 --- a/crates/pacdef_core/src/backend/actual/fedora.rs +++ b/crates/pacdef_core/src/backend/actual/fedora.rs @@ -21,7 +21,7 @@ const SWITCHES_INFO: Switches = &[ "repoquery", "--installed", "--queryformat", - "%{reponame}/%{name}", + "%{from_repo}/%{name}", ]; const SWITCHES_INSTALL: Switches = &["install"]; const SWITCHES_MAKE_DEPENDENCY: Switches = &[]; @@ -48,7 +48,7 @@ impl Backend for Fedora { "repoquery", "--userinstalled", "--queryformat", - "%{reponame}/%{name}", + "%{from_repo}/%{name}", ]); let output = String::from_utf8(cmd.output()?.stdout)?; @@ -68,9 +68,15 @@ impl Backend for Fedora { } for p in packages { - cmd.arg(format!("{p}")); + cmd.arg(&p.name); + if let Some(repo) = p.repo.as_ref() { + cmd.args(&["--repo", repo]); + } } + cmd.args(&["--repo", "updates"]); + cmd.args(&["--repo", "fedora"]); + run_external_command(cmd) } @@ -84,9 +90,8 @@ impl Backend for Fedora { } for p in packages { - cmd.arg(format!("{p}")); + cmd.arg(&p.name); } - run_external_command(cmd) }