fix(upgrade): run resolver before handle manual install

Author: eatradish

src/subcommand/upgrade.rs

@@ -190,19 +190,6 @@ impl CliExecuter for Upgrade {
 
         let mut apt = OmaApt::new(local_debs, oma_apt_args, dry_run, AptConfig::new())?;
 
-        #[cfg(feature = "aosc")]
-        let mode = AptUpgrade::FullUpgrade;
-
-        #[cfg(not(feature = "aosc"))]
-        let mode = if no_remove {
-            AptUpgrade::Upgrade
-        } else {
-            AptUpgrade::FullUpgrade
-        };
-
-        debug!("Upgrade mode is using: {:?}", mode);
-        apt.upgrade(mode)?;
-
         let matcher = PackagesMatcher::builder()
             .cache(&apt.cache)
             .filter_candidate(true)
@@ -226,6 +213,19 @@ impl CliExecuter for Upgrade {
             }
         }
 
+        #[cfg(feature = "aosc")]
+        let mode = AptUpgrade::FullUpgrade;
+
+        #[cfg(not(feature = "aosc"))]
+        let mode = if no_remove {
+            AptUpgrade::Upgrade
+        } else {
+            AptUpgrade::FullUpgrade
+        };
+
+        debug!("Upgrade mode is using: {:?}", mode);
+        apt.upgrade(mode)?;
+
         let code = CommitChanges::builder()
             .apt(apt)
             .dry_run(dry_run)