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-09 04:58:52 +0200 |
| commit | 12b55958d8884bd6828e0888ab9dc10d38bcd72f (patch) | |
| tree | 9d39d359eec670463a3b806aa6de61154b2059e3 /lib/libalpm/sync.c | |
| parent | 902dfe5900c89461e76f03a3429a867cc93fd418 (diff) | |
| download | pacman-12b55958d8884bd6828e0888ab9dc10d38bcd72f.tar.gz 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/sync.c')
| -rw-r--r-- | lib/libalpm/sync.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 47639248..dda4953d 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -504,7 +504,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync pmpkg_t *local = _alpm_db_get_pkgfromcache(db_local, conflict->package2); int doremove = 0; QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, conflict->package1, - conflict->package2, NULL, &doremove); + conflict->package2, conflict->reason, &doremove); if(doremove) { /* append to the removes list */ _alpm_log(PM_LOG_DEBUG, "electing '%s' for removal\n", conflict->package2); |