1
0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-10 03:25:01 -05:00
pacman/lib/libalpm
Chantry Xavier 88cbee3c24 libalpm/sync.c : conflicts resolving cleanup.
The original patch from Nagy tried to resolve target vs target conflicts,
and so broke the following pactests : sync040, sync041 and sync990

Nagy's proposal to solve this situation was to choose the interactive way,
ask the user how to deal with it: either remove pkg1 or remove pkg2 or stop
here.  So he left this as a TODO.

But instead of trying to resolve these conflicts or asking the user, I
tried to find a more conservative way, looking at what the current pactests
expected:
If between the two conflicting packages, one provides the other, pacman
will keep that one and remove the other from the target list.  That breaks
sync893 and sync897. But Dan agreed these two looked weird and should be
changed.

This commit should close FS#8897, FS#8899 and FS#9024.

Reference:
http://www.archlinux.org/pipermail/pacman-dev/2007-October/009745.html
http://www.archlinux.org/pipermail/pacman-dev/2007-December/010393.html

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-23 20:13:01 -06:00
..
po Portuguese Brazilian translation update for pacman 3.1.1 2008-01-19 00:00:50 +01:00
.gitignore Remove unnecessary entries from .gitignore files 2007-07-16 16:49:28 -04:00
add.c Fix memleak found by add004.py 2008-01-21 19:44:02 -06:00
add.h Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
alpm_list.c Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
alpm_list.h Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
alpm.c Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
alpm.h Add new public alpm_checkdbconflicts function. 2008-01-23 20:12:41 -06:00
backup.c Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
backup.h Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
be_files.c Move the deptest code from frontend to backend. 2008-01-21 19:35:43 -06:00
cache.c libalpm/cache.c : don't duplicate packages in pkgcache. 2008-01-23 20:13:01 -06:00
cache.h Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
conflict.c Add new public alpm_checkdbconflicts function. 2008-01-23 20:12:41 -06:00
conflict.h Add new public alpm_checkdbconflicts function. 2008-01-23 20:12:41 -06:00
db.c Merge branch 'maint' 2008-01-14 22:58:44 -06:00
db.h Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
delta.c Convert deltas to dynamic allocation 2008-01-21 19:33:32 -06:00
delta.h Convert deltas to dynamic allocation 2008-01-21 19:33:32 -06:00
deps.c Fix flip-flopped parameters to CALLOC macro 2008-01-23 20:13:01 -06:00
deps.h Move the deptest code from frontend to backend. 2008-01-21 19:35:43 -06:00
error.c Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
error.h Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
group.c Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
group.h Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
handle.c Fix library interface 2008-01-11 08:43:10 -06:00
handle.h Remove upgradedelay and all code associated with it 2008-01-08 15:49:52 -06:00
log.c Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
log.h Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
Makefile.am Remove provide.c and provide.h . 2007-11-17 09:50:05 -06:00
md5.c Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
md5.h Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
package.c Move the deptest code from frontend to backend. 2008-01-21 19:35:43 -06:00
package.h Merge branch 'maint' 2008-01-11 23:19:52 -06:00
remove.c Merge branch 'maint' 2008-01-13 12:27:17 -06:00
remove.h Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
server.c Use dynamic string allocation in package structures 2008-01-11 00:01:58 -06:00
server.h Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
sync.c libalpm/sync.c : conflicts resolving cleanup. 2008-01-23 20:13:01 -06:00
sync.h Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
trans.c libalpm/cache.c : don't duplicate packages in pkgcache. 2008-01-23 20:13:01 -06:00
trans.h Update GNU GPL boilerplate and copyright dates 2007-12-10 22:55:39 -06:00
util.c FS#9183 : force correct permissions on tmp/. 2008-01-13 18:42:26 -06:00
util.h Merge branch 'maint' 2008-01-14 22:58:44 -06:00