From 318fa86019e4bca9d17e433caebd671bbf15281c Mon Sep 17 00:00:00 2001
From: Juha <juha@lazarus-ide.org>
Date: Wed, 26 Jul 2023 10:23:58 +0300
Subject: [PATCH] IDE: Remove the "Ignore" option for uninstalling dependent
 packages. Fix the "Cancel" option.

---
 packager/installpkgsetdlg.pas | 8 +++++++-
 packager/pkgmanager.pas       | 3 +--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packager/installpkgsetdlg.pas b/packager/installpkgsetdlg.pas
index ec990ac183..520cf22a13 100644
--- a/packager/installpkgsetdlg.pas
+++ b/packager/installpkgsetdlg.pas
@@ -532,7 +532,7 @@ var
   i: Integer;
 begin
   for i:=0 to NewInstalledPackages.Count-1 do
-    if SysUtils.CompareText(TLazPackageID(NewInstalledPackages[i]).Name,PkgName)=0 then
+    if CompareText(TLazPackageID(NewInstalledPackages[i]).Name,PkgName)=0 then
       exit(true);
   Result:=false;
 end;
@@ -742,6 +742,12 @@ begin
 
     Result:=PackageEditingInterface.CheckInstallPackageList(
                     FNewInstalledPackages,UninstallPkgs,[piiifRemoveConflicts]);
+    if not Result then begin
+      AssignOldInstalledPackagesToList;  // Restore the old list.
+      UpdateNewInstalledPackages;
+      UpdateAvailablePackages(True);
+      UpdateButtonStates;
+    end;
   finally
     UninstallPkgs.Free;
   end;
diff --git a/packager/pkgmanager.pas b/packager/pkgmanager.pas
index 3dd2fa3b3c..98662ca1ff 100644
--- a/packager/pkgmanager.pas
+++ b/packager/pkgmanager.pas
@@ -5841,14 +5841,13 @@ begin
         if s='' then continue;
         case IDEQuestionDialog(lisUninstallFail,
            Format(lisThePackageIsUsedBy, [APackage.IDAsString])+sLineBreak +s,
-           mtConfirmation, [mrYes, lisUninstallThemToo, mrIgnore, mrCancel]
+           mtConfirmation, [mrYes, lisUninstallThemToo, mrCancel]
            ) of
         mrYes:
           begin
             for j:=0 to Dependencies.Count-1 do
               DeleteDependency(TPkgDependency(Dependencies[j]));
           end;
-        mrIgnore: ;
         else
           exit(false);
         end;