diff --git a/packages/fppkg/src/pkgcommands.pp b/packages/fppkg/src/pkgcommands.pp index 9da6429775..4fbb455d37 100644 --- a/packages/fppkg/src/pkgcommands.pp +++ b/packages/fppkg/src/pkgcommands.pp @@ -166,32 +166,32 @@ begin Error(SErrNoPackageSpecified); P:=PackageManager.PackageByName(PackageName, pkgpkAvailable); - log(llProgres,SLogPackageInfoName,[P.Name]); + log(llProgress,SLogPackageInfoName,[P.Name]); S := P.Email; if S <> '' then S := '<' + S +'>'; - log(llProgres,SLogPackageInfoAuthor,[P.Author, S]); - log(llProgres,SLogPackageInfoVersion,[P.Version.AsString]); - log(llProgres,SLogPackageInfoCategory,[P.Category]); - log(llProgres,SLogPackageInfoWebsite,[P.HomepageURL]); - log(llProgres,SLogPackageInfoLicense,[P.License]); + log(llProgress,SLogPackageInfoAuthor,[P.Author, S]); + log(llProgress,SLogPackageInfoVersion,[P.Version.AsString]); + log(llProgress,SLogPackageInfoCategory,[P.Category]); + log(llProgress,SLogPackageInfoWebsite,[P.HomepageURL]); + log(llProgress,SLogPackageInfoLicense,[P.License]); - log(llProgres,SLogPackageInfoOSes,[OSesToString(P.OSes)]); - log(llProgres,SLogPackageInfoCPUs,[CPUSToString(P.CPUs)]); + log(llProgress,SLogPackageInfoOSes,[OSesToString(P.OSes)]); + log(llProgress,SLogPackageInfoCPUs,[CPUSToString(P.CPUs)]); - log(llProgres,SLogPackageInfoDescription1); - log(llProgres,SLogPackageInfoDescription2,[P.Description]); + log(llProgress,SLogPackageInfoDescription1); + log(llProgress,SLogPackageInfoDescription2,[P.Description]); if P.Dependencies.Count>0 then begin - log(llProgres,SLogPackageInfoDependencies1,[]); + log(llProgress,SLogPackageInfoDependencies1,[]); for I := 0 to P.Dependencies.Count-1 do begin if not P.Dependencies[I].MinVersion.Empty then S := '('+P.Dependencies[I].MinVersion.AsString+')' else S := ''; - log(llProgres,SLogPackageInfoDependencies2,[P.Dependencies[I].PackageName,S]); + log(llProgress,SLogPackageInfoDependencies2,[P.Dependencies[I].PackageName,S]); end; end; end; @@ -227,9 +227,9 @@ end; function TCommandListSettings.Execute: Boolean; begin Result := True; - PackageManager.Options.LogValues(llProgres); - PackageManager.CompilerOptions.LogValues(llProgres,''); - PackageManager.FPMakeCompilerOptions.LogValues(llProgres,'fpmake-building '); + PackageManager.Options.LogValues(llProgress); + PackageManager.CompilerOptions.LogValues(llProgress,''); + PackageManager.FPMakeCompilerOptions.LogValues(llProgress,'fpmake-building '); end; @@ -639,7 +639,7 @@ begin if L.Count > 0 then begin if DependenciesDepth=0 then - pkgglobals.Log(llProgres,SProgrInstallDependencies); + pkgglobals.Log(llProgress,SProgrInstallDependencies); inc(DependenciesDepth); for i:=0 to L.Count-1 do @@ -648,7 +648,7 @@ begin dec(DependenciesDepth); if DependenciesDepth=0 then - pkgglobals.Log(llProgres,SProgrDependenciesInstalled); + pkgglobals.Log(llProgress,SProgrDependenciesInstalled); end; FreeAndNil(L); if assigned(ManifestPackages) then @@ -671,7 +671,7 @@ begin PackageManager.FindBrokenPackages(SL); if SL.Count=0 then break; - pkgglobals.Log(llProgres,SProgrReinstallDependent); + pkgglobals.Log(llProgress,SProgrReinstallDependent); for i:=0 to SL.Count-1 do begin if not ExecuteAction(SL[i],'build') then diff --git a/packages/fppkg/src/pkgdownload.pp b/packages/fppkg/src/pkgdownload.pp index dc6ba88e11..e09509c762 100644 --- a/packages/fppkg/src/pkgdownload.pp +++ b/packages/fppkg/src/pkgdownload.pp @@ -185,7 +185,7 @@ begin if RemoteArchive <> '' then begin Log(llCommands,SLogDownloading,[RemoteArchive,PackageManager.PackageLocalArchive(P)]); - pkgglobals.log(llProgres,SProgrDownloadPackage,[P.Name, P.Version.AsString]); + pkgglobals.log(llProgress,SProgrDownloadPackage,[P.Name, P.Version.AsString]); // Force the existing of the archives-directory if it is being used if (P.Name<>CurrentDirPackageName) and (P.Name<>CmdLinePackageName) then diff --git a/packages/fppkg/src/pkgglobals.pp b/packages/fppkg/src/pkgglobals.pp index aec0c3509e..e7f1c183bb 100644 --- a/packages/fppkg/src/pkgglobals.pp +++ b/packages/fppkg/src/pkgglobals.pp @@ -57,13 +57,13 @@ Const ); Type - TLogLevel = (llError,llWarning,llInfo,llCommands,llDebug,llProgres); + TLogLevel = (llError,llWarning,llInfo,llCommands,llDebug,llProgress); TLogLevels = Set of TLogLevel; TLogProc = procedure(Level:TLogLevel;Const Msg: String); const - DefaultLogLevels = [llError,llWarning, llProgres]; - AllLogLevels = [llError,llWarning,llCommands,llInfo,llProgres]; + DefaultLogLevels = [llError,llWarning, llProgress]; + AllLogLevels = [llError,llWarning,llCommands,llInfo,llProgress]; type EPackagerError = class(Exception); diff --git a/packages/fppkg/src/pkghandler.pp b/packages/fppkg/src/pkghandler.pp index e18772c3ee..9a96eb4a36 100644 --- a/packages/fppkg/src/pkghandler.pp +++ b/packages/fppkg/src/pkghandler.pp @@ -179,7 +179,7 @@ var if ch in [#10, #13] then begin - log(llProgres,sLine); + log(llProgress,sLine); sLine := ''; BuffPos := ConsoleOutput.Position; end