moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-21 23:38:49 -05:00
Code Issues Releases Wiki Activity

Add newline to the end of error messages for signature format issues

Browse Source 
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2016-07-03 23:05:41 +10:00
parent 56ae960376
commit 5b839c58ee
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libalpm/signing.c
View File

@ -998,21 +998,21 @@ int SYMEXPORT alpm_extract_keyid(alpm_handle_t *handle, const char *identifier,
while(pos < len) { while(pos < len) {
if(!(sig[pos] & 0x80)) { if(!(sig[pos] & 0x80)) {
_alpm_log(handle, ALPM_LOG_ERROR, _alpm_log(handle, ALPM_LOG_ERROR,
_("%s: signature format error"), identifier); _("%s: signature format error\n"), identifier);
return -1; return -1;
} }
if(sig[pos] & 0x40) { if(sig[pos] & 0x40) {
/* "new" packet format is not supported */ /* "new" packet format is not supported */
_alpm_log(handle, ALPM_LOG_ERROR, _alpm_log(handle, ALPM_LOG_ERROR,
_("%s: unsupported signature format"), identifier); _("%s: unsupported signature format\n"), identifier);
return -1; return -1;
} }
if(((sig[pos] & 0x3f) >> 2) != 2) { if(((sig[pos] & 0x3f) >> 2) != 2) {
/* signature is not a "Signature Packet" */ /* signature is not a "Signature Packet" */
_alpm_log(handle, ALPM_LOG_ERROR, _alpm_log(handle, ALPM_LOG_ERROR,
_("%s: signature format error"), identifier); _("%s: signature format error\n"), identifier);
return -1; return -1;
} }
@ -1035,21 +1035,21 @@ int SYMEXPORT alpm_extract_keyid(alpm_handle_t *handle, const char *identifier,
case 3: case 3:
/* partial body length not supported */ /* partial body length not supported */
_alpm_log(handle, ALPM_LOG_ERROR, _alpm_log(handle, ALPM_LOG_ERROR,
_("%s: unsupported signature format"), identifier); _("%s: unsupported signature format\n"), identifier);
return -1; return -1;
} }
if(sig[pos] != 4) { if(sig[pos] != 4) {
/* only support version 4 signature packet format */ /* only support version 4 signature packet format */
_alpm_log(handle, ALPM_LOG_ERROR, _alpm_log(handle, ALPM_LOG_ERROR,
_("%s: unsupported signature format"), identifier); _("%s: unsupported signature format\n"), identifier);
return -1; return -1;
} }
if(sig[pos + 1] != 0x00) { if(sig[pos + 1] != 0x00) {
/* not a signature of a binary document */ /* not a signature of a binary document */
_alpm_log(handle, ALPM_LOG_ERROR, _alpm_log(handle, ALPM_LOG_ERROR,
_("%s: signature format error"), identifier); _("%s: signature format error\n"), identifier);
return -1; return -1;
} }