diff options
| author | Nagy Gabor <ngaba@bibl.u-szeged.hu> | 2009-03-07 19:44:34 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-04-11 21:05:13 +0200 |
| commit | aefb4e0fa54ad5b4140d6991f389b5a6fb4ead6d (patch) | |
| tree | a3dd67506793245351ce0f92ab8208407f83e884 /lib/libalpm/package.c | |
| parent | 391952600d30bf7c28c5403c5c9e220d345ffe87 (diff) | |
| download | pacman-aefb4e0fa54ad5b4140d6991f389b5a6fb4ead6d.tar.gz pacman-aefb4e0fa54ad5b4140d6991f389b5a6fb4ead6d.tar.xz | |
Remove pmsyncpkg_t
pmsyncpkg_t data sructure was removed:
1. pmpkg_t.reason is used instead of pmsyncpkg_t.newreason. (The target
packages come from sync repos, so we can use this field without any
problems. Upgrade transaction also uses this field to store this info.)
2. pmsyncpkg_t.removes was moved to pmpkg_t.removes.
This step requires careful programming, because we don't duplicate packages
when we add them to trans->packages. So we modify sync pkgcache when we
add this transaction-only info to our package. Hence it is important to
free this list when we remove any package from the target list
(remove_unresolvable, remove_conflicts, trans_free), otherwise this could
confuse the new sync transactions (with non-pacman GUI).
Overall, our code became ~100 line shorter, and we can call our helper
functions directly on trans->packages in sync.c, we don't need to maintain
parallel package lists.
Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/package.c')
| -rw-r--r-- | lib/libalpm/package.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index ee0ff6f5..b63b5ec0 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -422,6 +422,13 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_backup(pmpkg_t *pkg) return pkg->backup; } +alpm_list_t SYMEXPORT *alpm_pkg_get_removes(pmpkg_t *pkg) +{ + ASSERT(pkg != NULL, return(NULL)); + + return(pkg->removes); +} + pmdb_t SYMEXPORT *alpm_pkg_get_db(pmpkg_t *pkg) { /* Sanity checks */ @@ -842,6 +849,7 @@ void _alpm_pkg_free(pmpkg_t *pkg) alpm_list_free_inner(pkg->deltas, (alpm_list_fn_free)_alpm_delta_free); alpm_list_free(pkg->deltas); alpm_list_free(pkg->delta_path); + alpm_list_free(pkg->removes); if(pkg->origin == PKG_FROM_FILE) { FREE(pkg->origin_data.file); |