diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-28 22:02:58 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-30 11:51:49 -0500 |
| commit | 13235ba65ab55d852dbdc0acabdc047442e74e28 (patch) | |
| tree | 85adbf195f380908af76f9527e92bea451dcf0a9 /lib/libalpm/add.c | |
| parent | b94e8ecd1fec4426baab8c90e7fc0d5583acdbef (diff) | |
| download | pacman-13235ba65ab55d852dbdc0acabdc047442e74e28.tar.xz | |
Make local_db_read() private to the local backend
There is little need to expose the guts of this function even within the
library. Make it static in be_local.c, and clean up a few other things
since we know exactly where it is being called from:
* Remove unnecessary origin checks in _cache_get_*() methods- if you are
calling a cache method your package type will be correct.
* Remove sanity checks within local_db_read() itself- packages will
always have a name and version if they get this far, and the package
object will never be NULL either.
The one case calling this from outside the backend was in add.c, where
we forced a full load of a package before we duplicated it. Move this
concern elsewhere and have pkg_dup() always force a full package load
via a new force_load() function on the operations callback struct.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/add.c')
| -rw-r--r-- | lib/libalpm/add.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 2d4b7baa..702e4d63 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -470,9 +470,6 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, /* we'll need to save some record for backup checks later */ oldpkg = _alpm_pkg_dup(local); - /* make sure all infos are loaded because the database entry - * will be removed soon */ - _alpm_local_db_read(oldpkg->origin_data.db, oldpkg, INFRQ_ALL); EVENT(trans, PM_TRANS_EVT_UPGRADE_START, newpkg, oldpkg); _alpm_log(handle, PM_LOG_DEBUG, "upgrading package %s-%s\n", |