paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-24 19:59:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: find broken packages: ignore FPMake packages, issue #34784

Browse Source 
git-svn-id: trunk@59950 -
This commit is contained in:
mattias 2018-12-31 10:01:46 +00:00
parent 365c570ff6
commit 5f2754d81a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packager/packagesystem.pas
View File

@ -2437,7 +2437,9 @@ function TLazPackageGraph.FindBrokenDependencyPath(APackage: TLazPackage;
RequiredPackage: TLazPackage;
begin
while Dependency<>nil do begin
if Dependency.LoadPackageResult=lprSuccess then begin
if Dependency.DependencyType=pdtFPMake then begin
// FPMake dependency have no RequiredPackage -> ignore
end else if Dependency.LoadPackageResult=lprSuccess then begin
// dependency ok
if Dependency.DependencyType=pdtLazarus then begin
RequiredPackage:=Dependency.RequiredPackage;
@ -2452,9 +2454,6 @@ function TLazPackageGraph.FindBrokenDependencyPath(APackage: TLazPackage;
end;
end;
end;
end else if Dependency.DependencyType=pdtFPMake then
begin
// FPMake packages have no lpk -> ignore
end else begin
// broken dependency found
PathList:=TFPList.Create;
@ -2487,15 +2486,15 @@ function TLazPackageGraph.FindAllBrokenDependencies(APackage: TLazPackage;
RequiredPackage: TLazPackage;
begin
while Dependency<>nil do begin
if Dependency.LoadPackageResult=lprSuccess then begin
if Dependency.DependencyType=pdtFPMake then begin
// FPMake dependency have no RequiredPackage -> ignore
end else if Dependency.LoadPackageResult=lprSuccess then begin
// dependency ok
RequiredPackage:=Dependency.RequiredPackage;
if not (lpfVisited in RequiredPackage.Flags) then begin
RequiredPackage.Flags:=RequiredPackage.Flags+[lpfVisited];
FindBroken(RequiredPackage.FirstRequiredDependency,DepList);
end;
end else if Dependency.DependencyType=pdtFPMake then begin
// FPMake package have no lpk -> ignore
end else begin
// broken dependency found
if (DepList=nil) or (DepList.IndexOf(Dependency)<0) then begin