fix(oma-pm): fix upgrade use APT::Solver=3.0

Author: eatradish

Cargo.lock

@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-oma-apt = "0.12"
+oma-apt = { git = "https://github.com/aosc-dev/oma-apt.git", rev = "b2171c27224628f670c3a7484ac678492a6df6c8" }
 thiserror = "2"
 chrono = { version = "0.4", features = ["unstable-locales"] }
 glob-match = "0.2"

oma-pm/Cargo.toml

@@ -19,7 +19,7 @@ oma-topics = { version = "^0.25.0", path = "../oma-topics", optional = true, def
 tracing ="0.1"
 oma-repo-verify = { version = "^0.9.0", path = "../oma-repo-verify", default-features = false }
 ahash = "0.8.11"
-oma-apt = { version = "0.12", optional = true }
+oma-apt = { git = "https://github.com/aosc-dev/oma-apt.git", rev = "b2171c27224628f670c3a7484ac678492a6df6c8", optional = true}
 aho-corasick = "1.1.3"
 # https://github.com/bytecodealliance/rustix/pull/1077
 # rustix = { version = "0.38", features = ["fs"] }

oma-refresh/Cargo.toml

@@ -241,6 +241,7 @@ impl CliExecuter for Upgrade {
             .maybe_auth_config(Some(&auth_config))
             .fix_dpkg_status(!no_fix_dpkg_status)
             .download_only(download_only)
+            .is_upgrade(true)
             .build()
             .run()?;
 

src/subcommand/upgrade.rs

@@ -321,6 +321,8 @@ pub(crate) struct CommitChanges<'a> {
     topics_disabled: Vec<String>,
     #[builder(default)]
     download_only: bool,
+    #[builder(default)]
+    is_upgrade: bool,
 }
 
 impl CommitChanges<'_> {
@@ -344,6 +346,7 @@ impl CommitChanges<'_> {
             topics_enabled,
             topics_disabled,
             download_only,
+            is_upgrade,
         } = self;
 
         fix_broken(
@@ -353,6 +356,7 @@ impl CommitChanges<'_> {
             fix_dpkg_status,
             remove_config,
             autoremove,
+            is_upgrade,
         )?;
 
         let op = apt.summary(
@@ -575,15 +579,18 @@ pub fn fix_broken(
     fix_dpkg_status: bool,
     remove_config: bool,
     autoremove: bool,
+    is_upgrade: bool,
 ) -> Result<(), OutputError> {
     let pb = create_progress_spinner(no_progress, fl!("resolving-dependencies"));
 
     let res = Ok(()).and_then(|_| -> Result<(), OmaAptError> {
+        let solver = apt.config.find("APT::Solver", "internal");
+
         if autoremove {
             apt.autoremove(remove_config)?;
         }
 
-        if !no_fixbroken {
+        if !no_fixbroken && solver != "3.0" {
             apt.fix_resolver_broken();
         }
 
@@ -598,6 +605,10 @@ pub fn fix_broken(
             }
         }
 
+        if solver == "3.0" && is_upgrade {
+            return Ok(());
+        }
+
         apt.resolve(no_fixbroken, remove_config)?;
 
         Ok(())