Alpm 3

rust/aura-arch/Cargo.toml

@@ -6,5 +6,5 @@ edition = "2021"
 description = "Common packaging interactions on an Arch Linux system."
 
 [dependencies]
-alpm = "2.2"
-alpm-utils = "2.0"
+alpm = "3.0"
+alpm-utils = "3.0"

rust/aura-core/Cargo.toml

@@ -10,8 +10,10 @@ license = "GPL-3.0-only"
 keywords = ["archlinux", "alpm", "aur", "pacman"]
 
 [dependencies]
-alpm = "2.2"
-alpm-utils = "2.0"
+r2d2-alpm = { version = "0.2", path = "../r2d2-alpm" }
+
+alpm = "3.0"
+alpm-utils = "3.0"
 disown = "1.0"
 from_variants = "1.0"
 itertools = "0.12"

rust/aura-core/src/aur/dependencies.rs

@@ -1,13 +1,13 @@
 //! AUR package dependency solving.
 
 use crate::Apply;
-use alpm::Alpm;
 use disown::Disown;
 use log::{debug, info};
 use nonempty_collections::NEVec;
 use petgraph::graph::NodeIndex;
 use petgraph::Graph;
 use r2d2::{ManageConnection, Pool};
+use r2d2_alpm::Alpm;
 use rayon::iter::{IntoParallelIterator, IntoParallelRefIterator, ParallelIterator};
 use srcinfo::Srcinfo;
 use std::borrow::Borrow;
@@ -244,7 +244,7 @@ where
             );
             let alpm = pool.get()?;
             debug!("Got a handle.");
-            let db = alpm.localdb();
+            let db = alpm.alpm.localdb();
             db.pkg(pr).is_ok() || db.pkgs().find_satisfier(pr).is_some()
         };
 
@@ -258,7 +258,7 @@ where
         } else {
             let alpm = pool.get()?;
 
-            match alpm.syncdbs().find_satisfier(pr) {
+            match alpm.alpm.syncdbs().find_satisfier(pr) {
                 Some(official) => {
                     debug!("{} is an official package.", pr);