Browse Source

* Show that dependencies are being installed

git-svn-id: trunk@16912 -
joost 14 years ago
parent
commit
8292cc17e2
2 changed files with 11 additions and 4 deletions
  1. 8 3
      utils/fppkg/pkgcommands.pp
  2. 3 1
      utils/fppkg/pkgmessages.pp

+ 8 - 3
utils/fppkg/pkgcommands.pp

@@ -371,8 +371,13 @@ begin
   if assigned(MissingDependency) then
   if assigned(MissingDependency) then
     Error(SErrNoPackageAvailable,[MissingDependency.PackageName,MissingDependency.MinVersion.AsString]);
     Error(SErrNoPackageAvailable,[MissingDependency.PackageName,MissingDependency.MinVersion.AsString]);
   // Install needed updates
   // Install needed updates
-  for i:=0 to L.Count-1 do
-    ExecuteAction(L[i],'install');
+  if L.Count > 0 then
+    begin
+      pkgglobals.Log(vlProgres,SProgrInstallDependencies);
+      for i:=0 to L.Count-1 do
+        ExecuteAction(L[i],'install');
+      pkgglobals.Log(vlProgres,SProgrDependenciesInstalled);
+    end;
   FreeAndNil(L);
   FreeAndNil(L);
   if FreeManifest then
   if FreeManifest then
     FreeAndNil(P);
     FreeAndNil(P);
@@ -389,7 +394,7 @@ begin
     FindBrokenPackages(SL);
     FindBrokenPackages(SL);
     if SL.Count=0 then
     if SL.Count=0 then
       break;
       break;
-    pkgglobals.Log(vlProgres,SWarnReinstallDependent);
+    pkgglobals.Log(vlProgres,SProgrReinstallDependent);
     for i:=0 to SL.Count-1 do
     for i:=0 to SL.Count-1 do
       begin
       begin
         ExecuteAction(SL[i],'build');
         ExecuteAction(SL[i],'build');

+ 3 - 1
utils/fppkg/pkgmessages.pp

@@ -109,7 +109,9 @@ Resourcestring
   SDbgPackageDependencyOtherTarget  = 'Dependency on package %s is not for %s';
   SDbgPackageDependencyOtherTarget  = 'Dependency on package %s is not for %s';
   SDbgObsoleteDependency     = 'Obsolete dependency found on package %s';
   SDbgObsoleteDependency     = 'Obsolete dependency found on package %s';
 
 
-  SWarnReinstallDependent    = 'Re-install packages which are dependent on just installed packages';
+  SProgrReinstallDependent   = 'Re-install packages which are dependent on just installed packages';
+  SProgrInstallDependencies  = 'Install dependencies';
+  SProgrDependenciesInstalled= 'Dependencies installed';
 
 
 implementation
 implementation