diff options
| author | VMiklos <vmiklos@frugalware.org> | 2007-04-01 21:17:30 -0400 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-04-01 21:52:28 -0400 |
| commit | 32924c9bdb414f36cb1bdc3eb5d8ccf6bea13526 (patch) | |
| tree | 135866572f636858ffd9c5537e3f30fbafeaca70 /lib/libalpm/remove.c | |
| parent | d32ef4329cce794a2ef0fb127a4e457bf74ff427 (diff) | |
| download | pacman-32924c9bdb414f36cb1bdc3eb5d8ccf6bea13526.tar.xz | |
Move the 100% progress bar call before remove scriptlet for output reasons
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/remove.c')
| -rw-r--r-- | lib/libalpm/remove.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 03b23d25..835d9d04 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -321,6 +321,11 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db) } } + /* set progress to 100% after we finish unlinking files */ + PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, pkgname, 100, + alpm_list_count(trans->packages), + (alpm_list_count(trans->packages) - alpm_list_count(targ) +1)); + if(trans->type != PM_TRANS_TYPE_UPGRADE) { /* run the post-remove script if it exists */ if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { @@ -349,10 +354,7 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db) _alpm_trans_update_depends(trans, infodup); _alpm_pkg_free(infodup); - - PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, pkgname, 100, - alpm_list_count(trans->packages), - (alpm_list_count(trans->packages) - alpm_list_count(targ) +1)); + /* call a done event if this isn't an upgrade */ if(trans->type != PM_TRANS_TYPE_UPGRADE) { EVENT(trans, PM_TRANS_EVT_REMOVE_DONE, info, NULL); } |