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

* Give a clear error when the source of a package is not available

Browse Source 
git-svn-id: trunk@35776 -
This commit is contained in:
joost 2017-04-11 16:42:37 +00:00
parent 2aa623964e
commit 61739262c7
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -366,11 +366,14 @@ begin
else else
begin begin
P:=PackageManager.FindPackage(PackageName, pkgpkAvailable); P:=PackageManager.FindPackage(PackageName, pkgpkAvailable);
if Assigned(P) then if not Assigned(P) then
begin begin
if P.PackagesStructure.UnzipBeforeUse then Error(Format(SErrPackageNotAvailable, [PackageName]));
ExecuteAction(PackageName,'unzip'); Exit;
end; end;
if P.PackagesStructure.UnzipBeforeUse then
ExecuteAction(PackageName,'unzip');
ExecuteAction(PackageName,'installdependencies'); ExecuteAction(PackageName,'installdependencies');
end; end;
end; end;

3
packages/fppkg/src/pkgmessages.pp
View File

@ -26,7 +26,8 @@ Resourcestring
SErrMissingPackage = 'Could not find package "%s"'; SErrMissingPackage = 'Could not find package "%s"';
SErrMissingInstallRepo = 'Could not find repository "%s"'; SErrMissingInstallRepo = 'Could not find repository "%s"';
SErrNoPackageSpecified = 'No package specified'; SErrNoPackageSpecified = 'No package specified';
SErrNoPackageAvailable = 'Package %s %s is not available'; SErrPackageNotAvailable = 'Source of package %s is not available';
SErrNoPackageAvailable = 'Package dependency %s %s is not available';
SErrOnlyLocalDir = 'The specified command "%s" works only on current dir, not on a (remote) package'; SErrOnlyLocalDir = 'The specified command "%s" works only on current dir, not on a (remote) package';
SErrIllConfRepository = 'Invalid configured repository "%s"'; SErrIllConfRepository = 'Invalid configured repository "%s"';
SErrExecutionFPMake = 'Execution of FPMake %s failed'; SErrExecutionFPMake = 'Execution of FPMake %s failed';