mirror of
https://github.com/moparisthebest/pacman
synced 2024-12-21 23:38:49 -05:00
Add newline to the end of error messages for signature format issues
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
56ae960376
commit
5b839c58ee
@ -998,21 +998,21 @@ int SYMEXPORT alpm_extract_keyid(alpm_handle_t *handle, const char *identifier,
|
||||
while(pos < len) {
|
||||
if(!(sig[pos] & 0x80)) {
|
||||
_alpm_log(handle, ALPM_LOG_ERROR,
|
||||
_("%s: signature format error"), identifier);
|
||||
_("%s: signature format error\n"), identifier);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if(sig[pos] & 0x40) {
|
||||
/* "new" packet format is not supported */
|
||||
_alpm_log(handle, ALPM_LOG_ERROR,
|
||||
_("%s: unsupported signature format"), identifier);
|
||||
_("%s: unsupported signature format\n"), identifier);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if(((sig[pos] & 0x3f) >> 2) != 2) {
|
||||
/* signature is not a "Signature Packet" */
|
||||
_alpm_log(handle, ALPM_LOG_ERROR,
|
||||
_("%s: signature format error"), identifier);
|
||||
_("%s: signature format error\n"), identifier);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -1035,21 +1035,21 @@ int SYMEXPORT alpm_extract_keyid(alpm_handle_t *handle, const char *identifier,
|
||||
case 3:
|
||||
/* partial body length not supported */
|
||||
_alpm_log(handle, ALPM_LOG_ERROR,
|
||||
_("%s: unsupported signature format"), identifier);
|
||||
_("%s: unsupported signature format\n"), identifier);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if(sig[pos] != 4) {
|
||||
/* only support version 4 signature packet format */
|
||||
_alpm_log(handle, ALPM_LOG_ERROR,
|
||||
_("%s: unsupported signature format"), identifier);
|
||||
_("%s: unsupported signature format\n"), identifier);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if(sig[pos + 1] != 0x00) {
|
||||
/* not a signature of a binary document */
|
||||
_alpm_log(handle, ALPM_LOG_ERROR,
|
||||
_("%s: signature format error"), identifier);
|
||||
_("%s: signature format error\n"), identifier);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user