diff options
| author | Nagy Gabor <ngaba@bibl.u-szeged.hu> | 2007-11-20 09:57:38 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-11-25 16:14:16 -0600 |
| commit | 72f40b3876263f7a8dcda1390026f43f599f8823 (patch) | |
| tree | a595b8061ef2c44b56c71479e323ca7bef65f070 /lib/libalpm/conflict.h | |
| parent | d683033d3ea79956faf8786f784ce2e271179892 (diff) | |
| download | pacman-72f40b3876263f7a8dcda1390026f43f599f8823.tar.xz | |
_alpm_checkconflicts split
_alpm_innerconflicts: check for target<->target conflicts
_alpm_outerconflicts: check for target<->localpkg conflicts
This will be useful in sync.c clean-up and in testdb.c
As an application the patch also fixes a misleading message (and a memleak)
in add.c
Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/conflict.h')
| -rw-r--r-- | lib/libalpm/conflict.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index 89695353..00a593e9 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -41,6 +41,8 @@ struct __pmfileconflict_t { pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2); int _alpm_conflict_isin(pmconflict_t *needle, alpm_list_t *haystack); +alpm_list_t *_alpm_innerconflicts(alpm_list_t *packages); +alpm_list_t *_alpm_outerconflicts(pmdb_t *db, alpm_list_t *packages); alpm_list_t *_alpm_checkconflicts(pmdb_t *db, alpm_list_t *packages); alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *root); |