This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 88cbee3c24768470cc0d4abe050e98b989807a67 (commit) via 69c6d59bb6efc1ae1bcf58d19d049d435dc974b2 (commit) via 8240da6cb3ff95ad480efe3e1876104024398fae (commit) via bd43a7f155cbd54d58fb45285e2eef1f51c88b00 (commit) via 22c900e7d57bfa7c9ed482f888ef200c0289ceec (commit) via 6b8f404a33b14ccb89f3adedf438f08b330a177a (commit) from 8ca6501ee1e3041f4fb186a33a9faf76f973efa2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 88cbee3c24768470cc0d4abe050e98b989807a67 Author: Chantry Xavier Date: Mon Aug 13 00:17:32 2007 +0200 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 Signed-off-by: Dan McGee commit 69c6d59bb6efc1ae1bcf58d19d049d435dc974b2 Author: Dan McGee Date: Tue Jan 22 18:52:21 2008 -0600 Fix flip-flopped parameters to CALLOC macro The mixup causes a fail in the build using --enable-debug on x86_64 but not i686, so none of us caught this right away. Fix it. FS#9297. Signed-off-by: Dan McGee commit 8240da6cb3ff95ad480efe3e1876104024398fae Author: Chantry Xavier Date: Sat Jan 12 21:28:22 2008 +0100 libalpm/cache.c : don't duplicate packages in pkgcache. Edit _alpm_db_add_pkgincache to not duplicate packages, because this is not needed, is slower, and uses more memory. This made the max memory usage during base reinstall go from 10.4MB to 9.7MB. Signed-off-by: Chantry Xavier Signed-off-by: Dan McGee commit bd43a7f155cbd54d58fb45285e2eef1f51c88b00 Author: Chantry Xavier Date: Sat Dec 8 00:17:34 2007 +0100 testdb : add conflicts checking. Testdb will now scan the local database to check there are no conflicts. I'm not sure how it's possible to get this situation. At least pacman doesn't allow installing a package that conflicts with a local one, without removing the local one. But maybe in a very weird situation, or because of a bug, it could be possible. But anyway, this only requires 5 lines of code. Signed-off-by: Chantry Xavier Signed-off-by: Dan McGee commit 22c900e7d57bfa7c9ed482f888ef200c0289ceec Author: Chantry Xavier Date: Sun Dec 9 14:49:34 2007 +0100 Add new public alpm_checkdbconflicts function. This function has a limited purpose, but might be interesting to do a sanity check from a frontend (eg testdb). Also removed the private _alpm_checkconflicts function to avoid confusion. This function was used only once in libalpm, in sync.c, and was just a single line anyway. Having to do it manually makes it explicit that we are looking for two kind of conflicts (targ vs targ and db vs targ). Signed-off-by: Chantry Xavier Signed-off-by: Dan McGee commit 6b8f404a33b14ccb89f3adedf438f08b330a177a Author: Chantry Xavier Date: Wed Jan 23 20:25:44 2008 +0100 small memleak fix in sync.c. Signed-off-by: Chantry Xavier ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.h | 2 + lib/libalpm/cache.c | 15 +-- lib/libalpm/conflict.c | 10 ++- lib/libalpm/conflict.h | 1 - lib/libalpm/deps.c | 4 +- lib/libalpm/sync.c | 261 +++++++++++++++++++-------------------------- lib/libalpm/trans.c | 3 +- pactest/tests/sync893.py | 4 +- pactest/tests/sync897.py | 6 +- src/util/testdb.c | 8 ++ 10 files changed, 139 insertions(+), 175 deletions(-) hooks/post-receive -- The official pacman repository