Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/pacman/remove.c6
-rw-r--r--src/pacman/sync.c6
-rw-r--r--src/pacman/upgrade.c6
-rw-r--r--src/util/pactree.c8
-rw-r--r--src/util/testdb.c5
5 files changed, 12 insertions, 19 deletions
diff --git a/src/pacman/remove.c b/src/pacman/remove.c
index a4e18941..2ce33b8a 100644
--- a/src/pacman/remove.c
+++ b/src/pacman/remove.c
@@ -115,10 +115,8 @@ int pacman_remove(alpm_list_t *targets)
case PM_ERR_UNSATISFIED_DEPS:
for(i = data; i; i = alpm_list_next(i)) {
pmdepmissing_t *miss = alpm_list_getdata(i);
- pmdepend_t *dep = alpm_miss_get_dep(miss);
- char *depstring = alpm_dep_compute_string(dep);
- printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss),
- depstring);
+ char *depstring = alpm_dep_compute_string(miss->depend);
+ printf(_(":: %s: requires %s\n"), miss->target, depstring);
free(depstring);
}
break;
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 254117a7..177eab64 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -785,10 +785,8 @@ static int sync_trans(alpm_list_t *targets)
case PM_ERR_UNSATISFIED_DEPS:
for(i = data; i; i = alpm_list_next(i)) {
pmdepmissing_t *miss = alpm_list_getdata(i);
- pmdepend_t *dep = alpm_miss_get_dep(miss);
- char *depstring = alpm_dep_compute_string(dep);
- printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss),
- depstring);
+ char *depstring = alpm_dep_compute_string(miss->depend);
+ printf(_(":: %s: requires %s\n"), miss->target, depstring);
free(depstring);
}
break;
diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c
index 0abcbe4e..6587671b 100644
--- a/src/pacman/upgrade.c
+++ b/src/pacman/upgrade.c
@@ -107,14 +107,12 @@ int pacman_upgrade(alpm_list_t *targets)
case PM_ERR_UNSATISFIED_DEPS:
for(i = data; i; i = alpm_list_next(i)) {
pmdepmissing_t *miss = alpm_list_getdata(i);
- pmdepend_t *dep = alpm_miss_get_dep(miss);
- char *depstring = alpm_dep_compute_string(dep);
+ char *depstring = alpm_dep_compute_string(miss->depend);
/* TODO indicate if the error was a virtual package or not:
* :: %s: requires %s, provided by %s
*/
- printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss),
- depstring);
+ printf(_(":: %s: requires %s\n"), miss->target, depstring);
free(depstring);
}
break;
diff --git a/src/util/pactree.c b/src/util/pactree.c
index 1dee61bf..6b29d935 100644
--- a/src/util/pactree.c
+++ b/src/util/pactree.c
@@ -290,7 +290,7 @@ static void walk_deps(pmpkg_t *pkg, int depth)
for(i = alpm_pkg_get_depends(pkg); i; i = alpm_list_next(i)) {
pmdepend_t *depend = alpm_list_getdata(i);
pmpkg_t *provider = alpm_find_satisfier(alpm_db_get_pkgcache(db_local),
- alpm_dep_get_name(depend));
+ depend->name);
if(provider) {
const char *provname = alpm_pkg_get_name(provider);
@@ -299,15 +299,15 @@ static void walk_deps(pmpkg_t *pkg, int depth)
/* if we've already seen this package, don't print in "unique" output
* and don't recurse */
if(!unique) {
- print(alpm_pkg_get_name(pkg), provname, alpm_dep_get_name(depend), depth);
+ print(alpm_pkg_get_name(pkg), provname, depend->name, depth);
}
} else {
- print(alpm_pkg_get_name(pkg), provname, alpm_dep_get_name(depend), depth);
+ print(alpm_pkg_get_name(pkg), provname, depend->name, depth);
walk_deps(provider, depth + 1);
}
} else {
/* unresolvable package */
- print(alpm_pkg_get_name(pkg), NULL, alpm_dep_get_name(depend), depth);
+ print(alpm_pkg_get_name(pkg), NULL, depend->name, depth);
}
}
}
diff --git a/src/util/testdb.c b/src/util/testdb.c
index aeccdb7c..4937480d 100644
--- a/src/util/testdb.c
+++ b/src/util/testdb.c
@@ -101,9 +101,8 @@ static int checkdeps(alpm_list_t *pkglist)
data = alpm_checkdeps(handle, pkglist, NULL, pkglist, 0);
for(i = data; i; i = alpm_list_next(i)) {
pmdepmissing_t *miss = alpm_list_getdata(i);
- pmdepend_t *dep = alpm_miss_get_dep(miss);
- char *depstring = alpm_dep_compute_string(dep);
- printf("missing dependency for %s : %s\n", alpm_miss_get_target(miss),
+ char *depstring = alpm_dep_compute_string(miss->depend);
+ printf("missing dependency for %s : %s\n", miss->target,
depstring);
free(depstring);
ret++;