diff options
| author | Xavier Chantry <shiningxc@gmail.com> | 2009-07-15 19:14:01 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-09-08 22:17:41 -0500 |
| commit | 8ff3b87066d35d3518a3cd0bef27b86c3a85e983 (patch) | |
| tree | a91691dccfa92d3021229f263b616ca4e35b5deb /lib/libalpm/conflict.c | |
| parent | 0da96abc900560f21c643b255c94a60232f4a24b (diff) | |
Remove transaction type
This basically started with this change :
/* Transaction */
struct __pmtrans_t {
- pmtranstype_t type;
pmtransflag_t flags;
pmtransstate_t state;
- alpm_list_t *packages; /* list of (pmpkg_t *) */
+ alpm_list_t *add; /* list of (pmpkg_t *) */
+ alpm_list_t *remove; /* list of (pmpkg_t *) */
And then I have to modify all the code accordingly.
Diffstat (limited to 'lib/libalpm/conflict.c')
| -rw-r--r-- | lib/libalpm/conflict.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index be97f004..e934c01e 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -516,7 +516,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, /* skip removal of file, but not add. this will prevent a second * package from removing the file when it was already installed * by its new owner (whether the file is in backup array or not */ - trans->skip_remove = alpm_list_add(trans->skip_remove, strdup(path)); + trans->skip_remove = alpm_list_add(trans->skip_remove, strdup(filestr)); _alpm_log(PM_LOG_DEBUG, "file changed packages, adding to remove skiplist: %s\n", filestr); resolved_conflict = 1; } |