paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-11 09:26:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Do not show the message that dependencies are being installed in recursive calls

Browse Source 
git-svn-id: trunk@16933 -
This commit is contained in:
joost 2011-02-18 20:58:12 +00:00
parent 58725cdedd
commit 04017bd0f3
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
utils/fppkg/pkgcommands.pp
View File

@ -117,6 +117,9 @@ type
Procedure Execute;override; Procedure Execute;override;
end; end;
var
DependenciesDepth: integer;
{ TCommandListSettings } { TCommandListSettings }
procedure TCommandListSettings.Execute; procedure TCommandListSettings.Execute;
@ -414,10 +417,16 @@ begin
// Install needed updates // Install needed updates
if L.Count > 0 then if L.Count > 0 then
begin begin
pkgglobals.Log(vlProgres,SProgrInstallDependencies); if DependenciesDepth=0 then
pkgglobals.Log(vlProgres,SProgrInstallDependencies);
inc(DependenciesDepth);
for i:=0 to L.Count-1 do for i:=0 to L.Count-1 do
ExecuteAction(L[i],'install'); ExecuteAction(L[i],'install');
pkgglobals.Log(vlProgres,SProgrDependenciesInstalled);
dec(DependenciesDepth);
if DependenciesDepth=0 then
pkgglobals.Log(vlProgres,SProgrDependenciesInstalled);
end; end;
FreeAndNil(L); FreeAndNil(L);
if FreeManifest then if FreeManifest then
@ -447,6 +456,7 @@ end;
initialization initialization
DependenciesDepth:=0;
RegisterPkgHandler('update',TCommandUpdate); RegisterPkgHandler('update',TCommandUpdate);
RegisterPkgHandler('list',TCommandListPackages); RegisterPkgHandler('list',TCommandListPackages);
RegisterPkgHandler('scan',TCommandScanPackages); RegisterPkgHandler('scan',TCommandScanPackages);