summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChantry Xavier <shiningxc@gmail.com>2007-07-13 23:09:25 +0200
committerDan McGee <dan@archlinux.org>2007-07-13 17:18:27 -0400
commitedcefb1d58115d4b5ae65e258f7eb53f33d21172 (patch)
tree1f43178f5e24cd87e69b833cc1f2421ac9f1fc21
parentb5ab4bffb785aa92c89ff2fee1c0c9a980367cd0 (diff)
downloadpacman-edcefb1d58115d4b5ae65e258f7eb53f33d21172.tar.xz
libalpm/remove.c : revert part of commit to fix remove044 pactest
In 1c9f30b9fab998e2d89dd307a90122618d746cb6 This change should be done AFTER the TODO in recursedeps is implemented. Then we'll be able to first sort the list, then call recursedeps which keeps it sorted. For now, the sorting should still be done as the last step. Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/remove.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index 2a080f85..775bd563 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -135,6 +135,11 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
}
}
+ if(trans->flags & PM_TRANS_FLAG_RECURSE) {
+ _alpm_log(PM_LOG_DEBUG, "finding removable dependencies");
+ _alpm_recursedeps(db, &trans->packages, 0);
+ }
+
/* re-order w.r.t. dependencies */
_alpm_log(PM_LOG_DEBUG, "sorting by dependencies");
lp = _alpm_sortbydeps(trans->packages, PM_TRANS_TYPE_REMOVE);
@@ -142,11 +147,6 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
alpm_list_free(trans->packages);
trans->packages = lp;
- if(trans->flags & PM_TRANS_FLAG_RECURSE) {
- _alpm_log(PM_LOG_DEBUG, "finding removable dependencies");
- _alpm_recursedeps(db, &trans->packages, 0);
- }
-
EVENT(trans, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL);
return(0);