Installer
/
melawy-welcome
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🚧 fix refresh keyrings in release build 

workaround bug that appears only in release build.
looks like the regex becomes optimized out.
This commit is contained in:
Vladislav Nepogodin 2023-04-02 17:31:08 +04:00
parent 0a7f4908b6
commit 61357e7261
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pages.rs
View File

@ -578,10 +578,13 @@ fn on_servbtn_clicked(button: &gtk::CheckButton) {
fn on_refreshkeyring_btn_clicked(_: &gtk::Button) { fn on_refreshkeyring_btn_clicked(_: &gtk::Button) {
let pacman = pacmanconf::Config::with_opts(None, Some("/etc/pacman.conf"), Some("/")).unwrap(); let pacman = pacmanconf::Config::with_opts(None, Some("/etc/pacman.conf"), Some("/")).unwrap();
let alpm = alpm_utils::alpm_with_conf(&pacman).unwrap(); let alpm = alpm_utils::alpm_with_conf(&pacman).unwrap();
// pacman -Qq | grep keyring
let needles = alpm // search local database for packages matching the regex ".*-keyring"
// e.g pacman -Qq | grep keyring
let needles: &[String] = &[".*-keyring".into()];
let found_keyrings = alpm
.localdb() .localdb()
.search([".*-keyring"].iter()) .search(needles.iter())
.unwrap() .unwrap()
.into_iter() .into_iter()
.filter(|pkg| pkg.name() != "gnome-keyring") .filter(|pkg| pkg.name() != "gnome-keyring")
@ -595,7 +598,7 @@ fn on_refreshkeyring_btn_clicked(_: &gtk::Button) {
// Spawn child process in separate thread. // Spawn child process in separate thread.
std::thread::spawn(move || { std::thread::spawn(move || {
let _ = utils::run_cmd_terminal( let _ = utils::run_cmd_terminal(
format!("pacman-key --init && pacman-key --populate {needles}"), format!("pacman-key --init && pacman-key --populate {found_keyrings}"),
true, true,
); );
}); });