bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed targets display for cascade or recurse commands

Browse source
This commit is contained in:
Aurelien Foret 2005-05-02 07:37:14 +00:00
parent 246f9f24a2
commit 1942c74489
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/pacman/remove.c
View file

@ -88,12 +88,12 @@ int pacman_remove(list_t *targets)
/* Step 2: prepare the transaction based on its type, targets and flags /* Step 2: prepare the transaction based on its type, targets and flags
*/ */
if(alpm_trans_prepare(&data) == -1) { if(alpm_trans_prepare(&data) == -1) {
PM_LIST *i; PM_LIST *lp;
ERR(NL, "failed to prepare transaction (%s)\n", alpm_strerror(pm_errno)); ERR(NL, "failed to prepare transaction (%s)\n", alpm_strerror(pm_errno));
switch(pm_errno) { switch(pm_errno) {
case PM_ERR_UNSATISFIED_DEPS: case PM_ERR_UNSATISFIED_DEPS:
for(i = alpm_list_first(data); i; i = alpm_list_next(i)) { for(lp = alpm_list_first(data); lp; lp = alpm_list_next(lp)) {
PM_DEPMISS *miss = alpm_list_getdata(i); PM_DEPMISS *miss = alpm_list_getdata(lp);
MSG(NL, " %s: is required by %s\n", alpm_dep_getinfo(miss, PM_DEP_TARGET), alpm_dep_getinfo(miss, PM_DEP_NAME)); MSG(NL, " %s: is required by %s\n", alpm_dep_getinfo(miss, PM_DEP_TARGET), alpm_dep_getinfo(miss, PM_DEP_NAME));
} }
alpm_list_free(data); alpm_list_free(data);
@ -107,10 +107,14 @@ int pacman_remove(list_t *targets)
/* Warn user in case of dangerous operation /* Warn user in case of dangerous operation
*/ */
if(pmo_flags & PM_TRANS_FLAG_RECURSE || pmo_flags & PM_TRANS_FLAG_CASCADE) { if(pmo_flags & PM_TRANS_FLAG_RECURSE || pmo_flags & PM_TRANS_FLAG_CASCADE) {
PM_LIST *lp;
/* list transaction targets */ /* list transaction targets */
/* ORE for(lp = alpm_list_first(alpm_trans_getinfo(PM_TRANS_PACKAGES)); lp; lp = alpm_list_next(lp)) {
* we need to get the list from TRANS_PACKAGES info instead of TRANS_TARGETS! */ PM_PKG *pkg = alpm_list_getdata(lp);
PM_LIST_display("\nTargets:", alpm_trans_getinfo(PM_TRANS_TARGETS)); i = list_add(i, strdup(alpm_pkg_getinfo(pkg, PM_PKG_NAME)));
}
list_display("\nTargets:", i);
list_free(i);
/* get confirmation */ /* get confirmation */
if(yesno("\nDo you want to remove these packages? [Y/n] ") == 0) { if(yesno("\nDo you want to remove these packages? [Y/n] ") == 0) {
goto error; goto error;