mirror of
https://github.com/moparisthebest/pacman
synced 2025-01-09 04:57:59 -05:00
Yet another "added three times" issue.
This commit is contained in:
parent
001526a67b
commit
cab295b9f5
@ -270,32 +270,6 @@ int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data)
|
|||||||
}
|
}
|
||||||
EVENT(trans, PM_TRANS_EVT_CLEANUP_DONE, NULL, NULL);
|
EVENT(trans, PM_TRANS_EVT_CLEANUP_DONE, NULL, NULL);
|
||||||
|
|
||||||
/* Cleaning up
|
|
||||||
*/
|
|
||||||
EVENT(trans, PM_TRANS_EVT_CLEANUP_START, NULL, NULL);
|
|
||||||
_alpm_log(PM_LOG_FLOW1, _("cleaning up"));
|
|
||||||
for (lp=trans->packages; lp!=NULL; lp=lp->next) {
|
|
||||||
info=(pmpkg_t *)lp->data;
|
|
||||||
for (rmlist=info->removes; rmlist!=NULL; rmlist=rmlist->next) {
|
|
||||||
snprintf(rm_fname, PATH_MAX, "%s%s", handle->root, (char *)rmlist->data);
|
|
||||||
remove(rm_fname);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
EVENT(trans, PM_TRANS_EVT_CLEANUP_DONE, NULL, NULL);
|
|
||||||
|
|
||||||
/* Cleaning up
|
|
||||||
*/
|
|
||||||
EVENT(trans, PM_TRANS_EVT_CLEANUP_START, NULL, NULL);
|
|
||||||
_alpm_log(PM_LOG_FLOW1, _("cleaning up"));
|
|
||||||
for (lp=trans->packages; lp!=NULL; lp=lp->next) {
|
|
||||||
info=(pmpkg_t *)lp->data;
|
|
||||||
for (rmlist=info->removes; rmlist!=NULL; rmlist=rmlist->next) {
|
|
||||||
snprintf(rm_fname, PATH_MAX, "%s%s", handle->root, (char *)rmlist->data);
|
|
||||||
remove(rm_fname);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
EVENT(trans, PM_TRANS_EVT_CLEANUP_DONE, NULL, NULL);
|
|
||||||
|
|
||||||
/* Check for file conflicts
|
/* Check for file conflicts
|
||||||
*/
|
*/
|
||||||
if(!(trans->flags & PM_TRANS_FLAG_FORCE)) {
|
if(!(trans->flags & PM_TRANS_FLAG_FORCE)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user