From 7a770dfa0c41b8c130bb8446101253fb13a8f4b1 Mon Sep 17 00:00:00 2001
From: balazs <balazs@lazarus-ide.org>
Date: Mon, 3 Dec 2018 07:32:02 +0000
Subject: [PATCH] Opkman: After a package is opened with "Open package
 file(.lpk)...", OPM wrongly reports the package as installed when in fact is
 not.

git-svn-id: trunk@59717 -
---
 .../onlinepackagemanager/opkman_mainfrm.pas   |  8 ++--
 .../opkman_serializablepackages.pas           | 39 +++++++++----------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/components/onlinepackagemanager/opkman_mainfrm.pas b/components/onlinepackagemanager/opkman_mainfrm.pas
index ce3cec1403..2458f21d57 100644
--- a/components/onlinepackagemanager/opkman_mainfrm.pas
+++ b/components/onlinepackagemanager/opkman_mainfrm.pas
@@ -807,13 +807,15 @@ procedure TMainFrm.tbUninstallClick(Sender: TObject);
   function GetIDEPackage(const AFileName: String): TIDEPackage;
   var
     I: Integer;
+    IDEPackge: TIDEPackage;
   begin
     Result := nil;
     for I := 0 to PackageEditingInterface.GetPackageCount - 1 do
     begin
-      if UpperCase(PackageEditingInterface.GetPackages(I).Filename) = UpperCase(AFileName) then
+      IDEPackge := PackageEditingInterface.GetPackages(I);
+      if UpperCase(IDEPackge.Filename) = UpperCase(AFileName) then
       begin
-        Result := PackageEditingInterface.GetPackages(I);
+        Result := IDEPackge;
         Break;
       end;
     end;
@@ -858,7 +860,7 @@ begin
           end;
           lptDesignTime, lptRunAndDesignTime:
           begin
-            IDEPackage := GetIDEPackage(LazarusPackage.PackageAbsolutePath);
+            IDEPackage := GetIDEPackage(LazarusPackage.InstalledFileName);
             if IDEPackage <> nil then
             begin
               if PackageEditingInterface.UninstallPackage(IDEPackage, False) <> mrOk then
diff --git a/components/onlinepackagemanager/opkman_serializablepackages.pas b/components/onlinepackagemanager/opkman_serializablepackages.pas
index e61eb26543..07072b6c4f 100644
--- a/components/onlinepackagemanager/opkman_serializablepackages.pas
+++ b/components/onlinepackagemanager/opkman_serializablepackages.pas
@@ -1121,30 +1121,27 @@ function TSerializablePackages.IsPackageInstalled(const ALazarusPkg: TLazarusPac
 
   function CheckIDEPackages: Boolean;
   var
-    PackageCnt: Integer;
-    I: Integer;
-    Package: TIDEPackage;
+    IDEPkg: TIDEPackage;
+    PkgExt: String;
+    PkgName: String;
   begin
     Result := False;
-    PackageCnt := PackageEditingInterface.GetPackageCount;
-    for I := 0 to PackageCnt - 1 do
+    PkgExt := ExtractFileExt(ALazarusPkg.Name);
+    PkgName := StringReplace(ALazarusPkg.Name, PkgExt, '', [rfIgnoreCase]);
+    IDEPkg := PackageEditingInterface.IsPackageInstalled(PkgName);
+    if IDEPkg <> nil then
     begin
-      Package := PackageEditingInterface.GetPackages(I);
-      if ExtractFileName(Package.FileName) = ALazarusPkg.Name then
-      begin
-        ALazarusPkg.InstalledFileName := Package.Filename;
-        ALazarusPkg.InstalledFileVersion := IntToStr(Package.Version.Major) + '.' +
-                                             IntToStr(Package.Version.Minor) + '.' +
-                                             IntToStr(Package.Version.Release) + '.' +
-                                             IntToStr(Package.Version.Build);
-        if FileExists(ALazarusPkg.InstalledFileName) then
-        begin
-          ALazarusPkg.InstalledFileDescription := GetPackageDescription(Package.Filename);
-          ALazarusPkg.InstalledFileLincese := GetPackageLicense(Package.Filename);
-        end;
-        Result := True;
-        Break;
-      end;
+      ALazarusPkg.InstalledFileName := IDEPkg.Filename;
+      ALazarusPkg.InstalledFileVersion := IntToStr(IDEPkg.Version.Major) + '.' +
+                                          IntToStr(IDEPkg.Version.Minor) + '.' +
+                                          IntToStr(IDEPkg.Version.Release) + '.' +
+                                          IntToStr(IDEPkg.Version.Build);
+     if FileExists(ALazarusPkg.InstalledFileName) then
+     begin
+       ALazarusPkg.InstalledFileDescription := GetPackageDescription(IDEPkg.Filename);
+       ALazarusPkg.InstalledFileLincese := GetPackageLicense(IDEPkg.Filename);
+     end;
+     Result := True;
     end;
   end;