diff options
| author | Nagy Gabor <ngaba@bibl.u-szeged.hu> | 2009-08-31 16:20:18 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-09-08 21:58:52 -0500 |
| commit | 12b55958d8884bd6828e0888ab9dc10d38bcd72f (patch) | |
| tree | 9d39d359eec670463a3b806aa6de61154b2059e3 /lib/libalpm/conflict.h | |
| parent | 902dfe5900c89461e76f03a3429a867cc93fd418 (diff) | |
| download | pacman-12b55958d8884bd6828e0888ab9dc10d38bcd72f.tar.xz | |
Add a new reason field to pmconflict_t struct
Sometimes "foo conflicts with bar" information is not enough, see this
thread: http://bbs.archlinux.org/viewtopic.php?id=77647. That's why I added
a new reason field to our pmconflict_t struct that stores the packager-
defined conflict that induced the fact that package1 conflicts with
package2.
I modified the front-end (in callback.c, sync.c, upgrade.c) to print this
new information as well.
Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
Diffstat (limited to 'lib/libalpm/conflict.h')
| -rw-r--r-- | lib/libalpm/conflict.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index 149c728e..73a6e959 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -27,6 +27,7 @@ struct __pmconflict_t { char *package1; char *package2; + char *reason; }; struct __pmfileconflict_t { @@ -36,7 +37,7 @@ struct __pmfileconflict_t { char *ctarget; }; -pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2); +pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2, const char *reason); pmconflict_t *_alpm_conflict_dup(const pmconflict_t *conflict); void _alpm_conflict_free(pmconflict_t *conflict); int _alpm_conflict_isin(pmconflict_t *needle, alpm_list_t *haystack); |