bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix replacement of provider issue

Browse source 
When we switched to using alpm_depcmp() in resolving replacments, we had
some interesting behavior with regard to providers and packages not
found in repositories. Teach the replacement resolving code to not look
at provisions at all to be slightly more sane.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-08-18 00:23:06 -05:00
parent d008a816f1
commit 3752edbff4
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/libalpm/sync.c
View file

@ -134,7 +134,8 @@ static alpm_list_t *check_replacers(alpm_handle_t *handle, alpm_pkg_t *lpkg,
alpm_list_t *l; alpm_list_t *l;
for(l = alpm_pkg_get_replaces(spkg); l; l = l->next) { for(l = alpm_pkg_get_replaces(spkg); l; l = l->next) {
alpm_depend_t *replace = l->data; alpm_depend_t *replace = l->data;
if(_alpm_depcmp(lpkg, replace)) { /* we only want to consider literal matches at this point. */
if(_alpm_depcmp_literal(lpkg, replace)) {
found = 1; found = 1;
break; break;
} }

2
test/pacman/tests/replace103.py
View file

@ -17,5 +17,3 @@ self.args = "-Su"
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=util-linux-git") self.addrule("PKG_EXIST=util-linux-git")
self.addrule("!PKG_EXIST=util-linux") self.addrule("!PKG_EXIST=util-linux")
self.expectfailure = True