Merge pull request #585 from AOSC-Dev/new-apt-solver-by-default

Author: eatradish

oma-pm/src/apt.rs

@@ -113,7 +113,11 @@ pub enum OmaAptError {
     #[error("Failed to mark package for reinstallation: {0}")]
     MarkReinstallError(String, String),
     #[error("Dependencies unmet")]
-    DependencyIssue(Vec<Vec<BrokenPackage>>),
+    DependencyIssue {
+        broken_depndencies: Vec<Vec<BrokenPackage>>,
+        is_solver3: bool,
+        apt_errors: AptErrors,
+    },
     #[error("Package: {0} is essential.")]
     PkgIsEssential(String),
     #[error("Package: {0} has no available candidate.")]
@@ -311,12 +315,20 @@ impl OmaApt {
         config.set_vector("Dpkg::Options::", &dpkg_args);
         debug!("dpkg args: {dpkg_args:?}");
 
-        for kv in another_apt_options {
-            let (k, v) = kv.split_once('=').unwrap_or((&kv, ""));
+        for kv in &another_apt_options {
+            let (k, v) = kv.split_once('=').unwrap_or((kv, ""));
             config.set(k, v);
             debug!("{k}={v} is set");
         }
 
+        #[cfg(feature = "aosc")]
+        if another_apt_options
+            .iter()
+            .all(|kv| !kv.starts_with("APT::Solver"))
+        {
+            config.set("APT::Solver", "3.0");
+        }
+
         Ok(config)
     }
 
@@ -710,7 +722,11 @@ impl OmaApt {
                     self.unmet.extend(res);
                 }
             }
-            return Err(OmaAptError::DependencyIssue(self.unmet.to_vec()));
+            return Err(OmaAptError::DependencyIssue {
+                broken_depndencies: self.unmet.to_vec(),
+                is_solver3: self.config.get("APT::Solver").is_some_and(|v| v == "3.0"),
+                apt_errors: e,
+            });
         }
 
         Ok(())

src/error.rs

@@ -661,10 +661,34 @@ pub fn oma_apt_error_to_output(err: OmaAptError) -> OutputError {
             description: fl!("can-not-mark-reinstall", name = pkg, version = version),
             source: None,
         },
-        OmaAptError::DependencyIssue(ref broken_deps) => {
+        OmaAptError::DependencyIssue {
+            broken_depndencies: broken_deps,
+            is_solver3,
+            apt_errors,
+        } => {
             error!("{}", fl!("dep-issue-1"));
+            debug!("{:#?}", broken_deps);
 
-            if !broken_deps.is_empty() {
+            if is_solver3 {
+                let mut errs = vec![];
+
+                for err in apt_errors.iter() {
+                    if !errs.contains(&err.msg) {
+                        errs.push(err.msg.to_string());
+                    }
+                }
+
+                #[cfg(feature = "aosc")]
+                if !errs.is_empty() {
+                    info!("{}", fl!("dep-issue-2"));
+                }
+
+                eprintln!();
+
+                for err in errs {
+                    msg!("{err}");
+                }
+            } else if !broken_deps.is_empty() {
                 let name_len_max = broken_deps
                     .iter()
                     .filter(|dep| !dep.is_empty())
@@ -683,7 +707,7 @@ pub fn oma_apt_error_to_output(err: OmaAptError) -> OutputError {
 
                     let mut last_name = "";
 
-                    for dep in broken_deps {
+                    for dep in &broken_deps {
                         let mut prefix = String::new();
                         if last_name != dep[0].name {
                             prefix = format!("{}:", dep[0].name);