summaryrefslogtreecommitdiffstats
path: root/src/pacman/remove.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/pacman/remove.c')
-rw-r--r--src/pacman/remove.c136
1 files changed, 81 insertions, 55 deletions
diff --git a/src/pacman/remove.c b/src/pacman/remove.c
index 9989f8e5..1028d9e8 100644
--- a/src/pacman/remove.c
+++ b/src/pacman/remove.c
@@ -1,8 +1,8 @@
/*
* remove.c
- *
+ *
* Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
@@ -24,46 +24,63 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <libintl.h>
#include <alpm.h>
#include <alpm_list.h>
/* pacman */
-#include "remove.h"
+#include "pacman.h"
#include "util.h"
-#include "log.h"
-#include "trans.h"
+#include "callback.h"
#include "conf.h"
-extern config_t *config;
-
extern pmdb_t *db_local;
+/* Free the current transaction and print an error if unsuccessful */
+static int remove_cleanup(void)
+{
+ int ret = alpm_trans_release();
+ if(ret != 0) {
+ pm_printf(PM_LOG_ERROR, _("failed to release transaction (%s)\n"),
+ alpm_strerrorlast());
+ ret = 1;
+ }
+
+ return(ret);
+}
+
+/**
+ * @brief Remove a specified list of packages.
+ *
+ * @param targets a list of packages (as strings) to remove from the system
+ *
+ * @return 0 on success, 1 on failure
+ */
int pacman_remove(alpm_list_t *targets)
{
- alpm_list_t *data = NULL, *i, *j, *finaltargs = NULL;
+ alpm_list_t *i, *data = NULL, *finaltargs = NULL;
int retval = 0;
if(targets == NULL) {
- return(0);
+ pm_printf(PM_LOG_ERROR, _("no targets specified (use -h for help)\n"));
+ return(1);
}
- /* If the target is a group, ask if its packages should be removed
+ /* If the target is a group, ask if its packages should be removed
* (the library can't remove groups for now)
*/
for(i = targets; i; i = alpm_list_next(i)) {
pmgrp_t *grp = alpm_db_readgrp(db_local, alpm_list_getdata(i));
if(grp) {
int all;
- alpm_list_t *pkgnames = alpm_grp_get_pkgs(grp);
+ const alpm_list_t *p, *pkgnames = alpm_grp_get_pkgs(grp);
- MSG(NL, _(":: group %s:\n"), alpm_grp_get_name(grp));
+ printf(_(":: group %s:\n"), alpm_grp_get_name(grp));
list_display(" ", pkgnames);
all = yesno(_(" Remove whole content? [Y/n] "));
- for(j = pkgnames; j; j = alpm_list_next(j)) {
- char *pkg = alpm_list_getdata(j);
+ for(p = pkgnames; p; p = alpm_list_next(p)) {
+ char *pkg = alpm_list_getdata(p);
if(all || yesno(_(":: Remove %s from group %s? [Y/n] "), pkg, (char *)alpm_list_getdata(i))) {
finaltargs = alpm_list_add(finaltargs, strdup(pkg));
}
@@ -74,84 +91,93 @@ int pacman_remove(alpm_list_t *targets)
}
}
- /* Step 1: create a new transaction
- */
- if(alpm_trans_init(PM_TRANS_TYPE_REMOVE, config->flags, cb_trans_evt, cb_trans_conv, cb_trans_progress) == -1) {
- ERR(NL, _("failed to init transaction (%s)\n"), alpm_strerror(pm_errno));
+ /* Step 1: create a new transaction */
+ if(alpm_trans_init(PM_TRANS_TYPE_REMOVE, config->flags,
+ cb_trans_evt, cb_trans_conv, cb_trans_progress) == -1) {
+ fprintf(stderr, _("error: failed to init transaction (%s)\n"),
+ alpm_strerrorlast());
if(pm_errno == PM_ERR_HANDLE_LOCK) {
- MSG(NL, _(" if you're sure a package manager is not already running,\n"
- " you can remove %s%s\n"), alpm_option_get_root(), PM_LOCK);
+ printf(_(" if you're sure a package manager is not already\n"
+ " running, you can remove %s.\n"), alpm_option_get_lockfile());
}
FREELIST(finaltargs);
return(1);
}
- /* and add targets to it */
+
+ /* add targets to the created transaction */
+ printf(_("loading package data... "));
for(i = finaltargs; i; i = alpm_list_next(i)) {
char *targ = alpm_list_getdata(i);
if(alpm_trans_addtarget(targ) == -1) {
- ERR(NL, _("failed to add target '%s' (%s)\n"), targ, alpm_strerror(pm_errno));
- retval = 1;
- goto cleanup;
+ printf("failed.\n");
+ fprintf(stderr, _("error: failed to add target '%s' (%s)\n"), targ,
+ alpm_strerrorlast());
+ remove_cleanup();
+ FREELIST(finaltargs);
+ return(1);
}
}
+ printf(_("done.\n"));
- /* 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) {
- ERR(NL, _("failed to prepare transaction (%s)\n"), alpm_strerror(pm_errno));
+ fprintf(stderr, _("error: failed to prepare transaction (%s)\n"),
+ alpm_strerrorlast());
switch(pm_errno) {
case PM_ERR_UNSATISFIED_DEPS:
for(i = data; i; i = alpm_list_next(i)) {
pmdepmissing_t *miss = alpm_list_getdata(i);
- MSG(NL, _(":: %s is required by %s\n"), alpm_dep_get_target(miss),
- alpm_dep_get_name(miss));
+ pmdepend_t *dep = alpm_miss_get_dep(miss);
+ char *depstring = alpm_dep_get_string(dep);
+ printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss),
+ depstring);
+ free(depstring);
}
+ alpm_list_free_inner(data, free);
alpm_list_free(data);
- break;
+ break;
default:
- break;
+ break;
}
- retval = 1;
- goto cleanup;
+ remove_cleanup();
+ FREELIST(finaltargs);
+ return(1);
}
- /* Warn user in case of dangerous operation
- */
- if(config->flags & PM_TRANS_FLAG_RECURSE || config->flags & PM_TRANS_FLAG_CASCADE) {
+ /* Warn user in case of dangerous operation */
+ if(config->flags & PM_TRANS_FLAG_RECURSE ||
+ config->flags & PM_TRANS_FLAG_CASCADE) {
/* list transaction targets */
alpm_list_t *lst = NULL;
+ /* create a new list of package names only */
for(i = alpm_trans_get_pkgs(); i; i = alpm_list_next(i)) {
pmpkg_t *pkg = alpm_list_getdata(i);
lst = alpm_list_add(lst, strdup(alpm_pkg_get_name(pkg)));
}
- MSG(NL, "\n");
+ printf("\n");
list_display(_("Targets:"), lst);
FREELIST(lst);
/* get confirmation */
if(yesno(_("\nDo you want to remove these packages? [Y/n] ")) == 0) {
- retval = 1;
- goto cleanup;
+ remove_cleanup();
+ FREELIST(finaltargs);
+ return(1);
}
- MSG(NL, "\n");
+ printf("\n");
}
- /* Step 3: actually perform the removal
- */
+ /* Step 3: actually perform the removal */
if(alpm_trans_commit(NULL) == -1) {
- ERR(NL, _("failed to commit transaction (%s)\n"), alpm_strerror(pm_errno));
- retval = 1;
- goto cleanup;
+ fprintf(stderr, _("error: failed to commit transaction (%s)\n"),
+ alpm_strerrorlast());
+ remove_cleanup();
+ FREELIST(finaltargs);
+ return(1);
}
- /* Step 4: release transaction resources
- */
-cleanup:
+ /* Step 4: release transaction resources */
+ retval = remove_cleanup();
FREELIST(finaltargs);
- if(alpm_trans_release() == -1) {
- ERR(NL, _("failed to release transaction (%s)\n"), alpm_strerror(pm_errno));
- retval = 1;
- }
-
return(retval);
}