Browse Source

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

git-svn-id: trunk@16933 -
joost 14 years ago
parent
commit
04017bd0f3
1 changed files with 12 additions and 2 deletions
  1. 12 2
      utils/fppkg/pkgcommands.pp

+ 12 - 2
utils/fppkg/pkgcommands.pp

@@ -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);