moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-15 05:45:03 -05:00
Code Issues Releases Wiki Activity

Swap parameters on PM_TRANS_CONV_INSTALL_IGNOREPKG callback function

Browse Source 
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>
This commit is contained in:
Nagy Gabor 2008-07-06 01:18:11 +02:00 committed by Dan McGee
parent 616b5967b8
commit 8856146d71
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libalpm/deps.c
View File

@ -599,7 +599,7 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg,
if(_alpm_pkg_should_ignore(sync)) { if(_alpm_pkg_should_ignore(sync)) {
pmpkg_t *dummypkg = _alpm_pkg_new(); pmpkg_t *dummypkg = _alpm_pkg_new();
STRDUP(dummypkg->name, miss->target, RET_ERR(PM_ERR_MEMORY, -1)); 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); _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)) { if(_alpm_pkg_should_ignore(sync)) {
pmpkg_t *dummypkg = _alpm_pkg_new(); pmpkg_t *dummypkg = _alpm_pkg_new();
STRDUP(dummypkg->name, miss->target, RET_ERR(PM_ERR_MEMORY, -1)); 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); _alpm_pkg_free(dummypkg);
} }
} }

4
src/pacman/callback.c
View File

@ -254,8 +254,8 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2,
if(data2) { if(data2) {
/* TODO we take this route based on data2 being not null? WTF */ /* TODO we take this route based on data2 being not null? WTF */
*response = yesno(1, _(":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway?"), *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 { } else {
*response = yesno(1, _(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"), *response = yesno(1, _(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"),
alpm_pkg_get_name(data1)); alpm_pkg_get_name(data1));