paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-07 05:18:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Packager: Use pure package name of a dependency when searching online packages.

Browse Source
This commit is contained in:
Juha 2022-06-12 17:55:08 +03:00
parent cba14e3559
commit f5321043f4
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packager/packageeditor.pas
View File

@ -727,7 +727,7 @@ var
end;
var
Writable: Boolean;
OpenItemEnable, Writable: Boolean;
OpenItemCapt: String;
begin
//debugln(['TPackageEditorForm.FilesPopupMenuPopup START ',ItemsPopupMenu.Items.Count]);
@ -737,6 +737,7 @@ begin
try
CollectSelected;
OpenItemCapt := lisOpen; // May be changed later.
OpenItemEnable := True;
Writable := not LazPackage.ReadOnly;
// items for Files node and for selected files, under section PkgEditMenuSectionFile
@ -789,10 +790,14 @@ begin
if Assigned(SingleSelectedDep) then
case SingleSelectedDep.LoadPackageResult of
lprAvailableOnline:
OpenItemCapt:=lisPckEditInstall;
OpenItemCapt := lisPckEditInstall;
lprNotFound:
if Assigned(OPMInterface) and not OPMInterface.IsPackageListLoaded then
OpenItemCapt:=lisPckEditCheckAvailabilityOnline;
OpenItemCapt := lisPckEditCheckAvailabilityOnline
else begin
//OpenItemCapt := lisUENotFound;
OpenItemEnable := False;
end;
end;
SetItem(PkgEditMenuRemoveDependency, @RemoveBitBtnClick,
pstdep in UserSelection, Writable);
@ -808,6 +813,7 @@ begin
Assigned(LazPackage.FirstRequiredDependency), Writable);
end;
PkgEditMenuOpenFile.MenuItem.Caption := OpenItemCapt;
PkgEditMenuOpenFile.MenuItem.Enabled := OpenItemEnable;
finally
//PackageEditorMenuRoot.EndUpdate;
SingleSelectedFile := Nil;

4
packager/projpackfilepropgui.pas
View File

@ -135,9 +135,9 @@ var
begin
Result := nil;
if OPMInterface = Nil then Exit;
PackageLink := LazPackageLinks.FindLinkWithPkgName(ADependency.AsString);
PackageLink := LazPackageLinks.FindLinkWithPkgName(ADependency.PackageName);
if Assigned(PackageLink) and (PackageLink.Origin = ploOnline)
and (ADependency.IsCompatible(PackageLink.Version)) then
and ADependency.IsCompatible(PackageLink.Version) then
begin
ADependency.LoadPackageResult := lprAvailableOnline;
Result := PackageLink;