diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-11-20 10:10:23 +0100 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-11-20 10:10:23 +0100 |
| commit | aa1c0ba9f8787fc3b1a1190103e394b0c1c95922 (patch) | |
| tree | ed0c9675f7fc5da043a69b36e0b8c6c8e05cb583 /src/pacman/add.c | |
| parent | b8b9596b13de957566211b0e1db3e473ed66e147 (diff) | |
| download | pacman-aa1c0ba9f8787fc3b1a1190103e394b0c1c95922.tar.gz pacman-aa1c0ba9f8787fc3b1a1190103e394b0c1c95922.tar.xz | |
* repo-add script - to add entries to a db file directly from package data (no PKGBUILD)
* libalpm api changes - move from a _getinfo(p, WHAT_WE_WANT) scheme to a
typesafe _get_what_we_want(p) scheme [not 100% complete yet]
* some const correctness changes
* removal of PM_* types in alpm.h in favor of the pm*_t types used throughout
libalpm
Diffstat (limited to 'src/pacman/add.c')
| -rw-r--r-- | src/pacman/add.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pacman/add.c b/src/pacman/add.c index 600bc625..9b5a650f 100644 --- a/src/pacman/add.c +++ b/src/pacman/add.c @@ -38,7 +38,7 @@ extern config_t *config; int pacman_add(list_t *targets) { - PM_LIST *data; + pmlist_t *data; list_t *i; int retval = 0; @@ -87,13 +87,13 @@ int pacman_add(list_t *targets) */ if(alpm_trans_prepare(&data) == -1) { long long *pkgsize, *freespace; - PM_LIST *i; + pmlist_t *i; ERR(NL, _("failed to prepare transaction (%s)\n"), alpm_strerror(pm_errno)); switch(pm_errno) { case PM_ERR_UNSATISFIED_DEPS: for(i = alpm_list_first(data); i; i = alpm_list_next(i)) { - PM_DEPMISS *miss = alpm_list_getdata(i); + pmdepmissing_t *miss = alpm_list_getdata(i); MSG(NL, _(":: %s: requires %s"), alpm_dep_getinfo(miss, PM_DEP_TARGET), alpm_dep_getinfo(miss, PM_DEP_NAME)); switch((long)alpm_dep_getinfo(miss, PM_DEP_MOD)) { @@ -107,7 +107,7 @@ int pacman_add(list_t *targets) break; case PM_ERR_CONFLICTING_DEPS: for(i = alpm_list_first(data); i; i = alpm_list_next(i)) { - PM_DEPMISS *miss = alpm_list_getdata(i); + pmdepmissing_t *miss = alpm_list_getdata(i); MSG(NL, _(":: %s: conflicts with %s"), alpm_dep_getinfo(miss, PM_DEP_TARGET), alpm_dep_getinfo(miss, PM_DEP_NAME)); } @@ -115,7 +115,7 @@ int pacman_add(list_t *targets) break; case PM_ERR_FILE_CONFLICTS: for(i = alpm_list_first(data); i; i = alpm_list_next(i)) { - PM_CONFLICT *conflict = alpm_list_getdata(i); + pmconflict_t *conflict = alpm_list_getdata(i); switch((long)alpm_conflict_getinfo(conflict, PM_CONFLICT_TYPE)) { case PM_CONFLICT_TYPE_TARGET: MSG(NL, _("%s%s exists in \"%s\" (target) and \"%s\" (target)"), |