summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/pacman/conf.c2
-rw-r--r--src/pacman/query.c4
-rw-r--r--src/pacman/remove.c2
-rw-r--r--src/pacman/sync.c6
4 files changed, 7 insertions, 7 deletions
diff --git a/src/pacman/conf.c b/src/pacman/conf.c
index 368e71fa..50b4988f 100644
--- a/src/pacman/conf.c
+++ b/src/pacman/conf.c
@@ -502,7 +502,7 @@ static int setup_libalpm(void)
alpm_option_set_usedelta(handle, config->usedelta);
alpm_option_set_ignorepkgs(handle, config->ignorepkg);
- alpm_option_set_ignoregrps(handle, config->ignoregrp);
+ alpm_option_set_ignoregroups(handle, config->ignoregrp);
alpm_option_set_noupgrades(handle, config->noupgrade);
alpm_option_set_noextracts(handle, config->noextract);
diff --git a/src/pacman/query.c b/src/pacman/query.c
index 0a420c78..826c2262 100644
--- a/src/pacman/query.c
+++ b/src/pacman/query.c
@@ -302,7 +302,7 @@ static int query_group(alpm_list_t *targets)
alpm_db_t *db_local = alpm_option_get_localdb(config->handle);
if(targets == NULL) {
- for(j = alpm_db_get_grpcache(db_local); j; j = alpm_list_next(j)) {
+ for(j = alpm_db_get_groupcache(db_local); j; j = alpm_list_next(j)) {
alpm_group_t *grp = alpm_list_getdata(j);
const alpm_list_t *p;
@@ -315,7 +315,7 @@ static int query_group(alpm_list_t *targets)
for(i = targets; i; i = alpm_list_next(i)) {
alpm_group_t *grp;
grpname = alpm_list_getdata(i);
- grp = alpm_db_readgrp(db_local, grpname);
+ grp = alpm_db_readgroup(db_local, grpname);
if(grp) {
const alpm_list_t *p;
for(p = grp->packages; p; p = alpm_list_next(p)) {
diff --git a/src/pacman/remove.c b/src/pacman/remove.c
index d48b0386..4a23ab2e 100644
--- a/src/pacman/remove.c
+++ b/src/pacman/remove.c
@@ -47,7 +47,7 @@ static int remove_target(const char *target)
}
/* fallback to group */
- alpm_group_t *grp = alpm_db_readgrp(db_local, target);
+ alpm_group_t *grp = alpm_db_readgroup(db_local, target);
if(grp == NULL) {
pm_fprintf(stderr, PM_LOG_ERROR, "'%s': target not found\n", target);
return -1;
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 20be450c..ce57d3cd 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -398,7 +398,7 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets)
const char *grpname = alpm_list_getdata(i);
for(j = syncs; j; j = alpm_list_next(j)) {
alpm_db_t *db = alpm_list_getdata(j);
- alpm_group_t *grp = alpm_db_readgrp(db, grpname);
+ alpm_group_t *grp = alpm_db_readgroup(db, grpname);
if(grp) {
/* get names of packages in group */
@@ -417,7 +417,7 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets)
for(i = syncs; i; i = alpm_list_next(i)) {
alpm_db_t *db = alpm_list_getdata(i);
- for(j = alpm_db_get_grpcache(db); j; j = alpm_list_next(j)) {
+ for(j = alpm_db_get_groupcache(db); j; j = alpm_list_next(j)) {
alpm_group_t *grp = alpm_list_getdata(j);
if(level > 1) {
@@ -634,7 +634,7 @@ static int process_group(alpm_list_t *dbs, char *group)
{
int ret = 0;
alpm_list_t *i;
- alpm_list_t *pkgs = alpm_find_grp_pkgs(dbs, group);
+ alpm_list_t *pkgs = alpm_find_group_pkgs(dbs, group);
int count = alpm_list_count(pkgs);
if(!count) {