Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNagy Gabor <ngaba@bibl.u-szeged.hu>2008-07-06 01:18:11 +0200
committerDan McGee <dan@archlinux.org>2008-07-07 21:12:30 -0500
commit8856146d71cb4cc512b0cf3414fbc231635822d3 (patch)
tree5917c0597dae8c2a6f6dc6538843424a3037c45b
parent616b5967b8581d51f9e08dd4178c921eee617d4b (diff)
Swap parameters on PM_TRANS_CONV_INSTALL_IGNOREPKG callback function
PM_TRANS_CONV_INSTALL_IGNOREPKG callback function can get 2 params: foo, bar in this order (packages), bar can be NULL. Old API: foo, NULL: Do you want to install foo from IgnorePkg? foo, bar: foo requires bar from IgnorePkg. Do you want to install bar? New API: foo, bar: Do you want to install foo from IgnorePkg? (If bar!=NULL:) bar requires it. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/deps.c4
-rw-r--r--src/pacman/callback.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c
index e67b0083..cd154070 100644
--- a/lib/libalpm/deps.c
+++ b/lib/libalpm/deps.c
@@ -599,7 +599,7 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg,
if(_alpm_pkg_should_ignore(sync)) {
pmpkg_t *dummypkg = _alpm_pkg_new();
STRDUP(dummypkg->name, miss->target, RET_ERR(PM_ERR_MEMORY, -1));
- QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, dummypkg, sync, NULL, &found);
+ QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, sync, dummypkg, NULL, &found);
_alpm_pkg_free(dummypkg);
}
}
@@ -622,7 +622,7 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg,
if(_alpm_pkg_should_ignore(sync)) {
pmpkg_t *dummypkg = _alpm_pkg_new();
STRDUP(dummypkg->name, miss->target, RET_ERR(PM_ERR_MEMORY, -1));
- QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, dummypkg, sync, NULL, &found);
+ QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, sync, dummypkg, NULL, &found);
_alpm_pkg_free(dummypkg);
}
}
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index ff125c36..f968873f 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -254,8 +254,8 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2,
if(data2) {
/* TODO we take this route based on data2 being not null? WTF */
*response = yesno(1, _(":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway?"),
- alpm_pkg_get_name(data1),
- alpm_pkg_get_name(data2));
+ alpm_pkg_get_name(data2),
+ alpm_pkg_get_name(data1));
} else {
*response = yesno(1, _(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"),
alpm_pkg_get_name(data1));