summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/conflict.c
AgeCommit message (Expand)AuthorFilesLines
2011-07-03Merge remote-tracking branch 'allan/ALPM'Dan McGee1-21/+21
2011-07-03conflict code tweaks and cleanupsDan McGee1-20/+14
2011-07-03Move alpm filelists to a struct objectDan McGee1-16/+39
2011-07-01Prefix _alpm_errno_t members with ALPMAllan McRae1-3/+3
2011-07-01Prefix alpm_transprog_t members with ALPMAllan McRae1-2/+2
2011-07-01Prefix alpm_loglevel_t members with ALPMAllan McRae1-13/+13
2011-07-01Prefix alpm_fileconflicttype_t members with ALPMAllan McRae1-3/+3
2011-06-30Fix a few warnings pointed out via clang scan-buildDan McGee1-1/+1
2011-06-28Rename pmfileconflict_t to alpm_fileconflict_tAllan McRae1-4/+4
2011-06-28Rename pmconflict_t to alpm_conflict_tAllan McRae1-11/+11
2011-06-28Rename pmdepend_t to alpm_depend_tAllan McRae1-1/+1
2011-06-28Rename pmtrans_t to alpm_trans_tAllan McRae1-1/+1
2011-06-28Rename pmpkg_t to alpm_pkg_tAllan McRae1-6/+6
2011-06-28Rename pmdb_t to alpm_db_tAllan McRae1-1/+1
2011-06-28Rename pmhandle_t to alpm_handle_tAllan McRae1-6/+6
2011-06-28Rename pmfileconflicttype_t to alpm_fileconflicttype_tAllan McRae1-1/+1
2011-06-27Merge branch 'maint'Dan McGee1-13/+22
2011-06-27Ensure a file can be replaced by a directoryDan McGee1-8/+18
2011-06-27File conflict code cleanupsDan McGee1-11/+11
2011-06-16Make struct pmconflict_t publicDan McGee1-18/+0
2011-06-16Make pmfileconflict_t type publicDan McGee1-24/+0
2011-06-14Ensure handle is valid and pm_errno is reset when calling into APIDan McGee1-0/+1
2011-06-14Conflict check and skip_remove code cleanupsDan McGee1-34/+50
2011-06-14Switch all logging to use handle directlyDan McGee1-32/+38
2011-06-14Move pm_errno onto the handleDan McGee1-32/+33
2011-06-14Require handle for alpm_checkconflicts()Dan McGee1-8/+12
2011-06-09Kill all remaining 'PATH_MAX + 1' usagesDan McGee1-3/+3
2011-06-03Remove global handle dependencies from sync/upgrade pathsDan McGee1-9/+7
2011-06-03Push down extern handle variable to files that need itDan McGee1-0/+3
2011-06-03Remove unnecessary handle != NULL assertsDan McGee1-7/+0
2011-06-03Remove ALPM_LOG_FUNC macroDan McGee1-24/+0
2011-05-04Fix warnings reported by -Wwrite-stringsDan McGee1-5/+3
2011-03-31Unify filelist operation functions in conflict checkingDan McGee1-51/+25
2011-03-21Style change: return(x) --> return xDan McGee1-31/+31
2011-02-25alpm: alpm_db_get_pkgcache_list => alpm_db_get_pkgcacheDave Reisner1-1/+1
2011-02-17Conflict checking code cleanupDan McGee1-30/+13
2011-02-11Fix fileconflict progress with only one packageDan McGee1-2/+4
2011-02-04Read pkgcache into hashAllan McRae1-2/+2
2011-01-10Remove need for floating point division in backendDan McGee1-2/+2
2011-01-08Fix some more simple conversion "errors"Dan McGee1-2/+2
2011-01-08Use size_t for alpm_list sizesAllan McRae1-2/+2
2011-01-08Update copyright years for 2011Allan McRae1-1/+1
2010-12-13alpm: don't expose alpm_depcmpXavier Chantry1-1/+1
2010-10-13Move the cache stuff where it should beDan McGee1-1/+0
2010-08-24Fix some whitespace issuesAllan McRae1-1/+1
2010-06-20Clarify testing within conditional statementsAllan McRae1-2/+2
2010-03-15Bump copyright dates to 2010Dan McGee1-1/+1
2010-03-15fix a few warnings reported by clangXavier Chantry1-1/+1
2009-09-09Remove transaction typeXavier Chantry1-1/+1
2009-09-09Add a new reason field to pmconflict_t structNagy Gabor1-5/+19