diff options
author | Aurelien Foret <aurelien@archlinux.org> | 2006-02-05 09:27:26 +0000 |
---|---|---|
committer | Aurelien Foret <aurelien@archlinux.org> | 2006-02-05 09:27:26 +0000 |
commit | 325e3b6b98ee4ca217b153157936b77dc570bb57 (patch) | |
tree | 3a1f892f1e46c129be6370e9e44960e9be3e08ea /lib/libalpm/alpm.h | |
parent | c432d525064dc9fd96bd32ade922740defd0c766 (diff) | |
download | pacman-325e3b6b98ee4ca217b153157936b77dc570bb57.tar.xz |
added a pmconflict_t structure to handle file conflicts
Diffstat (limited to 'lib/libalpm/alpm.h')
-rw-r--r-- | lib/libalpm/alpm.h | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index fb764446..47318ada 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -49,6 +49,7 @@ typedef struct __pmgrp_t PM_GRP; typedef struct __pmsyncpkg_t PM_SYNCPKG; typedef struct __pmtrans_t PM_TRANS; typedef struct __pmdepmissing_t PM_DEPMISS; +typedef struct __pmconflict_t PM_CONFLICT; /* * Library @@ -268,7 +269,7 @@ int alpm_trans_commit(PM_LIST **data); int alpm_trans_release(void); /* - * Dependencies + * Dependencies and conflicts */ enum { @@ -294,6 +295,24 @@ enum { void *alpm_dep_getinfo(PM_DEPMISS *miss, unsigned char parm); /* + * File conflicts + */ + +enum { + PM_CONFLICT_TYPE_TARGET = 1, + PM_CONFLICT_TYPE_FILE +}; +/* Info parameters */ +enum { + PM_CONFLICT_TARGET = 1, + PM_CONFLICT_TYPE, + PM_CONFLICT_FILE, + PM_CONFLICT_CTARGET +}; + +void *alpm_conflict_getinfo(PM_CONFLICT *conflict, unsigned char parm); + +/* * Helpers */ |