diff options
| author | Dan McGee <dan@archlinux.org> | 2009-09-20 12:09:10 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-09-20 12:09:10 -0500 |
| commit | 6bfca2fd14d07a18d7000d1f9dd998428036656f (patch) | |
| tree | c766b1ea0071f17857a975b15f53a8f77909f46d /lib/libalpm/remove.c | |
| parent | ef3716877032941f7882c11c5a091abef95ef983 (diff) | |
| parent | 338c6546ff86acbb25c1508439adfb89c3dea952 (diff) | |
| download | pacman-6bfca2fd14d07a18d7000d1f9dd998428036656f.tar.xz | |
Merge branch 'maint'
Message updates made this one a bit messy, but nothing too bad.
Conflicts:
lib/libalpm/add.c
lib/libalpm/remove.c
Diffstat (limited to 'lib/libalpm/remove.c')
| -rw-r--r-- | lib/libalpm/remove.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index af2ce943..7bafaf1c 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -71,7 +71,7 @@ int SYMEXPORT alpm_remove_target(char *target) } if((info = _alpm_db_get_pkgfromcache(db_local, target)) != NULL) { - _alpm_log(PM_LOG_DEBUG, "adding %s in the targets list\n", info->name); + _alpm_log(PM_LOG_DEBUG, "adding %s in the target list\n", info->name); trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(info)); return(0); } @@ -83,7 +83,7 @@ int SYMEXPORT alpm_remove_target(char *target) } for(p = alpm_grp_get_pkgs(grp); p; p = alpm_list_next(p)) { pmpkg_t *pkg = alpm_list_getdata(p); - _alpm_log(PM_LOG_DEBUG, "adding %s in the targets list\n", pkg->name); + _alpm_log(PM_LOG_DEBUG, "adding %s in the target list\n", pkg->name); trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(pkg)); } @@ -102,7 +102,7 @@ static void remove_prepare_cascade(pmtrans_t *trans, pmdb_t *db, pmpkg_t *info = _alpm_db_get_pkgfromcache(db, miss->target); if(info) { if(!_alpm_pkg_find(trans->remove, alpm_pkg_get_name(info))) { - _alpm_log(PM_LOG_DEBUG, "pulling %s in the targets list\n", + _alpm_log(PM_LOG_DEBUG, "pulling %s in target list\n", alpm_pkg_get_name(info)); trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(info)); } @@ -122,7 +122,7 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db, { ALPM_LOG_FUNC; - /* Remove needed packages (which break dependencies) from the target list */ + /* Remove needed packages (which break dependencies) from target list */ while(lp != NULL) { alpm_list_t *i; for(i = lp; i; i = i->next) { @@ -136,7 +136,7 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db, &vpkg); pkg = vpkg; if(pkg) { - _alpm_log(PM_LOG_WARNING, "removing %s from the target-list\n", + _alpm_log(PM_LOG_WARNING, _("removing %s from target list\n"), alpm_pkg_get_name(pkg)); _alpm_pkg_free(pkg); } @@ -172,7 +172,7 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) remove_prepare_cascade(trans, db, lp); } else if (trans->flags & PM_TRANS_FLAG_UNNEEDED) { /* Remove needed packages (which would break dependencies) - * from the target list */ + * from target list */ remove_prepare_keep_needed(trans, db, lp); } else { if(data) { |