diff options
| author | Dan McGee <dan@archlinux.org> | 2007-02-20 02:14:27 +0000 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-02-20 02:14:27 +0000 |
| commit | 03f034ef0eacaca3611193007c24d6c2af94bdb8 (patch) | |
| tree | d0b13f3e0c3cca0a07cd908e8d332697df03dff9 /lib/libalpm/conflict.h | |
| parent | 3f802fb38ed11a73f343191c0b3178d37d5e8a4d (diff) | |
| download | 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/conflict.h')
| -rw-r--r-- | lib/libalpm/conflict.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index 69ce727c..44507f72 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -34,7 +34,7 @@ struct __pmconflict_t { }; alpm_list_t *_alpm_checkconflicts(pmdb_t *db, alpm_list_t *packages); -alpm_list_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root, alpm_list_t **skip_list); +alpm_list_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root); #endif /* _ALPM_CONFLICT_H */ |