mirror of
https://github.com/moparisthebest/pacman
synced 2024-11-16 06:15:08 -05:00
Move the 100% progress bar call before remove scriptlet for output reasons
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
d32ef4329c
commit
32924c9bdb
@ -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) {
|
if(trans->type != PM_TRANS_TYPE_UPGRADE) {
|
||||||
/* run the post-remove script if it exists */
|
/* run the post-remove script if it exists */
|
||||||
if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
|
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_trans_update_depends(trans, infodup);
|
||||||
_alpm_pkg_free(infodup);
|
_alpm_pkg_free(infodup);
|
||||||
|
|
||||||
|
/* call a done event if this isn't an upgrade */
|
||||||
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) {
|
if(trans->type != PM_TRANS_TYPE_UPGRADE) {
|
||||||
EVENT(trans, PM_TRANS_EVT_REMOVE_DONE, info, NULL);
|
EVENT(trans, PM_TRANS_EVT_REMOVE_DONE, info, NULL);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user