bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add reason to corrupted package callback

Browse source 
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-08-08 19:55:44 -05:00
parent 9d09c9fdf7
commit 5f38660be1
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/libalpm/sync.c
View file

@ -677,14 +677,16 @@ static int apply_deltas(alpm_handle_t *handle)
* *
* @param trans the transaction * @param trans the transaction
* @param filename the absolute path of the file to test * @param filename the absolute path of the file to test
* @param reason an error code indicating the reason for package invalidity
* *
* @return 1 if file was removed, 0 otherwise * @return 1 if file was removed, 0 otherwise
*/ */
static int prompt_to_delete(alpm_trans_t *trans, const char *filepath) static int prompt_to_delete(alpm_trans_t *trans, const char *filepath,
enum _alpm_errno_t reason)
{ {
int doremove = 0; int doremove = 0;
QUESTION(trans, ALPM_TRANS_CONV_CORRUPTED_PKG, (char *)filepath, QUESTION(trans, ALPM_TRANS_CONV_CORRUPTED_PKG, (char *)filepath,
NULL, NULL, &doremove); &reason, NULL, &doremove);
if(doremove) { if(doremove) {
unlink(filepath); unlink(filepath);
} }
@ -711,7 +713,7 @@ static int validate_deltas(alpm_handle_t *handle, alpm_list_t *deltas,
ret = _alpm_test_md5sum(filepath, d->delta_md5); ret = _alpm_test_md5sum(filepath, d->delta_md5);
if(ret != 0) { if(ret != 0) {
prompt_to_delete(trans, filepath); prompt_to_delete(trans, filepath, ALPM_ERR_DLT_INVALID);
errors++; errors++;
*data = alpm_list_add(*data, strdup(d->delta)); *data = alpm_list_add(*data, strdup(d->delta));
} }
@ -899,7 +901,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data)
alpm_pkg_t *pkgfile =_alpm_pkg_load_internal(handle, filepath, 1, spkg->md5sum, alpm_pkg_t *pkgfile =_alpm_pkg_load_internal(handle, filepath, 1, spkg->md5sum,
spkg->base64_sig, level); spkg->base64_sig, level);
if(!pkgfile) { if(!pkgfile) {
prompt_to_delete(trans, filepath); prompt_to_delete(trans, filepath, handle->pm_errno);
errors++; errors++;
*data = alpm_list_add(*data, strdup(filename)); *data = alpm_list_add(*data, strdup(filename));
FREE(filepath); FREE(filepath);

6
src/pacman/callback.c
View file

@ -330,8 +330,10 @@ void cb_trans_conv(alpm_transconv_t event, void *data1, void *data2,
} }
break; break;
case ALPM_TRANS_CONV_CORRUPTED_PKG: case ALPM_TRANS_CONV_CORRUPTED_PKG:
*response = yesno(_(":: File %s is corrupted. Do you want to delete it?"), *response = yesno(_(":: File %s is corrupted (%s).\n"
(char *)data1); "Do you want to delete it?"),
(char *)data1,
alpm_strerror(*(enum _alpm_errno_t *)data2));
break; break;
} }
if(config->noask) { if(config->noask) {