paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-05 04:09:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Solved possible AV

Browse Source 
git-svn-id: trunk@35769 -
This commit is contained in:
joost 2017-04-10 21:13:44 +00:00
parent e5be5bd460
commit a9d4b17638
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/fppkg/src/fprepos.pp
View File

@ -142,6 +142,7 @@ type
Procedure Assign(Source : TPersistent); override; Procedure Assign(Source : TPersistent); override;
Function AddDependency(Const APackageName : String; const AMinVersion : String = '') : TFPDependency; Function AddDependency(Const APackageName : String; const AMinVersion : String = '') : TFPDependency;
Function IsPackageBroken: Boolean; Function IsPackageBroken: Boolean;
Function GetDebugName: string;
Property Dependencies : TFPDependencies Read FDependencies; Property Dependencies : TFPDependencies Read FDependencies;
Property OSes : TOSes Read FOSes Write FOses; Property OSes : TOSes Read FOSes Write FOses;
Property CPUs : TCPUs Read FCPUs Write FCPUs; Property CPUs : TCPUs Read FCPUs Write FCPUs;
@ -337,6 +338,7 @@ ResourceString
SErrDuplicatePackageName = 'Duplicate package name : "%s"'; SErrDuplicatePackageName = 'Duplicate package name : "%s"';
SErrMaxLevelExceeded = 'Maximum number of dependency levels exceeded (%d) at package "%s".'; SErrMaxLevelExceeded = 'Maximum number of dependency levels exceeded (%d) at package "%s".';
SErrMirrorNotFound = 'Mirror "%s" not found.'; SErrMirrorNotFound = 'Mirror "%s" not found.';
SRepoUnknown = 'RepositoryUnknown';
Function MakeTargetString(CPU : TCPU;OS: TOS) : String; Function MakeTargetString(CPU : TCPU;OS: TOS) : String;
@ -724,6 +726,13 @@ begin
raise Exception.Create(SErrRepositoryNotAssigned); raise Exception.Create(SErrRepositoryNotAssigned);
end; end;
Function TFPPackage.GetDebugName: string;
begin
if Assigned(Repository) then
Result:=Repository.RepositoryName+'-'+Name
else
Result:=SRepoUnknown+'-'+Name;
end;
{ TFPPackages } { TFPPackages }

6
packages/fppkg/src/pkgcommands.pp
View File

@ -423,7 +423,11 @@ begin
case InstallRepo.DefaultPackagesStructure.IsInstallationNeeded(AvailPackage) of case InstallRepo.DefaultPackagesStructure.IsInstallationNeeded(AvailPackage) of
fpinInstallationNeeded: fpinInstallationNeeded:
begin begin
log(llDebug,SDbgPackageInstallRequired,[AvailPackage.Repository.RepositoryName+'-'+PackageName, InstallRepo.RepositoryName]); if Assigned(AvailPackage) then
S := AvailPackage.GetDebugName
else
S := PackageName;
log(llDebug,SDbgPackageInstallRequired,[S, InstallRepo.RepositoryName]);
ExecuteAction(PackageName,'fpmakeinstall'); ExecuteAction(PackageName,'fpmakeinstall');
end; end;
fpinInstallationImpossible: fpinInstallationImpossible: