summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/conflict.c
AgeCommit message (Collapse)AuthorFilesLines
2006-10-20A handful of minor changes:Aaron Griffin1-14/+14
* Removed the PMList typedef, in favor of the same naming scheme other structs use 'pmlist_t' * Added a time stamp on debug output, to make it more informational * Moved alpm_db_register to _alpm_db_register, making the public function not take a callback parameter
2006-10-16Copyright changesAaron Griffin1-0/+1
2006-10-16Applied Frugalware patch from Christian Hamar alias krix <krics@linuxforum.hu>Aaron Griffin1-2/+5
for file-conflict progress bar Also did some CVS cleanup, removing some of the autogenerated files that shouldn't have been there
2006-10-16Applied changes from frugalware:Aaron Griffin1-3/+1
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=commitdiff;h=20061009002226-e2957-93b82621b6b060312559ea0539699f659bd9cb97.gz
2006-10-15Merged frugalware changes (too many to list). Also added some config fileAaron Griffin1-9/+9
handling changes (support [sections] to carry over to included files - this helps with backwards compatibility with existing pacman config files)
2006-05-15first stage of i18n stuff from VMiklosJudd Vinet1-13/+14
2006-03-07removed db_scan calls - take 2Aurelien Foret1-1/+0
2006-03-07removed db_scan callsAurelien Foret1-3/+20
2006-03-04added more debug logsAurelien Foret1-1/+4
2006-03-02code cleanupAurelien Foret1-3/+1
2006-02-22conflict checks: when doing db-vs-target checks, opt to use the NEWER, ↵Judd Vinet1-2/+20
to-be-installed package instead of the local db version if there's one available
2006-02-17prepend library function names with _alpm (helped with the patch from ↵Aurelien Foret1-31/+30
VMiklos <vmiklos@frugalware.org>) added log and event callbacks to sync_commit internal transactions
2006-02-05added a pmconflict_t structure to handle file conflictsAurelien Foret1-11/+16
2006-02-01fixed typos in 2 debug logsAurelien Foret1-2/+2
2006-01-18more code cleanup yetAurelien Foret1-54/+24
2006-01-17fixed detection for duplicate entries in list of deps/conflictsAurelien Foret1-6/+6
2006-01-17reworked log messagesAurelien Foret1-6/+6
2006-01-17- code cleanupAurelien Foret1-6/+6
- log improvements
2006-01-15pulled out conflict checkings from checkdeps() in its own function: ↵Aurelien Foret1-0/+172
checkconflicts()
2006-01-02patch from VMiklos - use PACKAGE_VERSION instead of PACMAN_VERSIONJudd Vinet1-1/+1
2006-01-02fixed a possible memory corruptionAurelien Foret1-1/+1
2005-10-08Merging in recent fixes/additions from 2.9.7Judd Vinet1-67/+71
2005-10-06Added a CYGWIN define to include header files required to build in a Cygwin ↵Aurelien Foret1-0/+3
environment
2005-04-24fixed a commented MLK in db_find_conflicts()/CHECK1Aurelien Foret1-0/+1
2005-03-22moved db_find_conflicts from db.c to conflict.cAurelien Foret1-0/+162