diff options
| author | Dan McGee <dan@archlinux.org> | 2007-02-20 03:14:27 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-02-20 03:14:27 +0100 |
| commit | 03f034ef0eacaca3611193007c24d6c2af94bdb8 (patch) | |
| tree | d0b13f3e0c3cca0a07cd908e8d332697df03dff9 /lib/libalpm/trans.c | |
| parent | 3f802fb38ed11a73f343191c0b3178d37d5e8a4d (diff) | |
| download | pacman-03f034ef0eacaca3611193007c24d6c2af94bdb8.tar.gz pacman-03f034ef0eacaca3611193007c24d6c2af94bdb8.tar.xz | |
* Updated conflict checking one last time. You can finally have a file move
from one package to another seemlessly (knock on wood). This is implemented
through the use of two skip lists in the trans struct- skip_add and
skip_remove, which replace the former trans->skiplist.
* Removed an unnecessary function parameter, added a necessary one.
* If a package has no backup files, print '(none)' under the heading so it is
more obvious.
* Updated my TODO list.
Diffstat (limited to 'lib/libalpm/trans.c')
| -rw-r--r-- | lib/libalpm/trans.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 4969214f..64cb47c5 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -55,7 +55,8 @@ pmtrans_t *_alpm_trans_new() trans->targets = NULL; trans->packages = NULL; - trans->skiplist = NULL; + trans->skip_add = NULL; + trans->skip_remove = NULL; trans->type = 0; trans->flags = 0; trans->cb_event = NULL; @@ -87,7 +88,8 @@ void _alpm_trans_free(void *data) FREELISTPKGS(trans->packages); } - FREELIST(trans->skiplist); + FREELIST(trans->skip_add); + FREELIST(trans->skip_remove); FREE(trans); } |