moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-12 04:15:06 -05:00
Code Issues Releases Wiki Activity

Fix integrity check status when installing from file

Browse Source 
When installing packages from a file, the integrity check count
stays at (0/x) complete.  This ensures it is bumped to (x/x) at
the end of the process.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-01-18 13:19:25 -06:00
parent a88cb03a58
commit f65edb7f29
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libalpm/sync.c
View File

@ -953,7 +953,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
EVENT(trans, PM_TRANS_EVT_INTEGRITY_START, NULL, NULL); EVENT(trans, PM_TRANS_EVT_INTEGRITY_START, NULL, NULL);
errors = 0; errors = 0;
for(i = trans->add; i; i = i->next) { for(i = trans->add; i; i = i->next, current++) {
pmpkg_t *spkg = i->data; pmpkg_t *spkg = i->data;
int percent = (current * 100) / numtargs; int percent = (current * 100) / numtargs;
if(spkg->origin == PKG_FROM_FILE) { if(spkg->origin == PKG_FROM_FILE) {
@ -986,7 +986,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
pkgfile->reason = spkg->reason; /* copy over install reason */ pkgfile->reason = spkg->reason; /* copy over install reason */
i->data = pkgfile; i->data = pkgfile;
_alpm_pkg_free_trans(spkg); /* spkg has been removed from the target list */ _alpm_pkg_free_trans(spkg); /* spkg has been removed from the target list */
current++;
} }
PROGRESS(trans, PM_TRANS_PROGRESS_INTEGRITY_START, "", 100, PROGRESS(trans, PM_TRANS_PROGRESS_INTEGRITY_START, "", 100,
numtargs, current); numtargs, current);