Quellcode durchsuchen

Improve messages and fix a problem.

Martijn Laan vor 3 Monaten
Ursprung
Commit
387af86d00

+ 3 - 3
Projects/Src/Compiler.Messages.pas

@@ -89,9 +89,9 @@ const
   SCompilerVerificationSignatureDoesntExist = 'The signature file "%1" does not exist';
   SCompilerVerificationSignatureMalformed = 'The signature file "%1" is malformed';
   SCompilerVerificationSignatureBad = 'The signature file "%1" is bad';
-  SCompilerVerificationKeyNotFound = 'No matching key found';
-  SCompilerVerificationFileSizeIncorrect = 'The file size is incorrect';
-  SCompilerVerificationFileHashIncorrect = 'The file hash is incorrect';
+  SCompilerVerificationKeyNotFound = 'The signature file "%1" uses an unknown key';
+  SCompilerVerificationFileSizeIncorrect = 'The size of the file is incorrect';
+  SCompilerVerificationFileHashIncorrect = 'The hash of the file is incorrect';
   SCompilerCopyError3a = 'Could not copy "%s" to "%s".' + SNewLine2 + 'Error %s';
   SCompilerCopyError3b = 'Could not copy "%s" to "%s".' + SNewLine2 + 'Error %d: %s';
   SCompilerReadError = 'Could not read "%s".' + SNewLine2 + 'Error: %s';

+ 2 - 2
Projects/Src/Compiler.SetupCompiler.pas

@@ -7126,8 +7126,8 @@ var
               begin
                 var VerifyResultAsString: String;
                 case VerifyResult of
-                  vsrMalformed: ISSigVerifyError(vseSignatureMalformed, SigFilename);
-                  vsrBad: ISSigVerifyError(vseSignatureBad, SigFilename);
+                  vsrMalformed: ISSigVerifyError(vseSignatureMalformed, Filename, SigFilename);
+                  vsrBad: ISSigVerifyError(vseSignatureBad, Filename, SigFilename);
                   vsrKeyNotFound: ISSigVerifyError(vseKeyNotFound, Filename, SigFilename);
                 else
                   AbortCompileFmt(SCompilerCompressInternalError, ['Unknown ISSigVerifySignature result'])

+ 1 - 1
Projects/Src/Setup.Install.pas

@@ -298,7 +298,7 @@ begin
       case VerifyResult of
         vsrMalformed:  ISSigVerifyError(vseSignatureMalformed, SigFilename);
         vsrBad: ISSigVerifyError(vseSignatureBad, SigFilename);
-        vsrKeyNotFound: ISSigVerifyError(vseKeyNotFound);
+        vsrKeyNotFound: ISSigVerifyError(vseKeyNotFound, SigFilename);
       else
         InternalError('Unknown ISSigVerifySignature result');
       end;