From ec1f3b433abe28c6c9311c1bc85823ca22ef0562 Mon Sep 17 00:00:00 2001
From: Michal S <michal@tar.black>
Date: Sat, 20 Aug 2022 14:24:04 +0100
Subject: [PATCH] Ensured #6 doesn't happen (fixed #6) and fixed #13

---
 src/operations/upgrade.rs | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/operations/upgrade.rs b/src/operations/upgrade.rs
index ebfe508..27f3cd3 100644
--- a/src/operations/upgrade.rs
+++ b/src/operations/upgrade.rs
@@ -5,7 +5,7 @@ use crate::internal::exit_code::AppExitCode;
 use crate::internal::rpc::rpcinfo;
 use crate::args::UpgradeArgs;
 use crate::operations::aur_install::aur_install;
-use crate::{info, log, prompt, Options, spinner};
+use crate::{info, log, prompt, warn, Options, spinner};
 
 #[derive(Debug)]
 struct QueriedPackage {
@@ -49,15 +49,19 @@ pub fn upgrade(options: Options, args: UpgradeArgs) {
             // If pacman was successful, notify user
             info!("Successfully upgraded repo packages");
         } else {
-            // Otherwise, prompt user whether to continue
-            let cont = prompt!(default false,
-            "Failed to upgrade repo packages, continue to upgrading AUR packages?",
-        );
-            if !cont {
-                // If user doesn't want to continue, break
-                info!("Exiting");
-                std::process::exit(AppExitCode::PacmanError as i32);
-            }
+            // Otherwise warn user
+            warn!(
+                "Failed to upgrade repo packages.",
+            );
+        }
+    }
+
+    if args.repo && args.aur {
+        let cont = prompt!(default false, "Continue to upgrade AUR packages?");
+        if !cont {
+            // If user doesn't want to continue, break
+            info!("Exiting");
+            std::process::exit(AppExitCode::PacmanError as i32);
         }
     }
 
@@ -121,7 +125,7 @@ pub fn upgrade(options: Options, args: UpgradeArgs) {
 
         // If vector isn't empty, prompt to install AUR packages from vector, effectively upgrading
         if !aur_upgrades.is_empty() {
-            let cont = prompt!(default false,
+            let cont = prompt!(default true,
             "Found AUR packages {} have new versions available, upgrade?",
             aur_upgrades.join(", "),
         );