diff options
| author | Dan McGee <dan@archlinux.org> | 2011-01-18 20:19:25 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-01-18 20:19:25 +0100 |
| commit | f65edb7f299537357354b5bd637353db6c7ddcd1 (patch) | |
| tree | f0275372c03a538fc5267af2cf691480ca8c2b51 /lib/libalpm/sync.c | |
| parent | a88cb03a58909304603a794e42070656fca6b626 (diff) | |
| download | pacman-f65edb7f299537357354b5bd637353db6c7ddcd1.tar.gz pacman-f65edb7f299537357354b5bd637353db6c7ddcd1.tar.xz | |
Fix integrity check status when installing from file
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>
Diffstat (limited to 'lib/libalpm/sync.c')
| -rw-r--r-- | lib/libalpm/sync.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index b1eab55b..dbd15065 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -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); errors = 0; - for(i = trans->add; i; i = i->next) { + for(i = trans->add; i; i = i->next, current++) { pmpkg_t *spkg = i->data; int percent = (current * 100) / numtargs; 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 */ i->data = pkgfile; _alpm_pkg_free_trans(spkg); /* spkg has been removed from the target list */ - current++; } PROGRESS(trans, PM_TRANS_PROGRESS_INTEGRITY_START, "", 100, numtargs, current); |