diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-07 20:46:11 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-14 02:35:22 +0200 |
| commit | d76341297a089864cf9bb509873bdcff83755f6c (patch) | |
| tree | 30f154fb6e6d24357f7902ab5c2e7622c66173ae /src | |
| parent | fb3ad7f8823dd3300528b44427d40e17594b1400 (diff) | |
| download | pacman-d76341297a089864cf9bb509873bdcff83755f6c.tar.gz pacman-d76341297a089864cf9bb509873bdcff83755f6c.tar.xz | |
Require handle for alpm_pkg_load()
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/query.c | 2 | ||||
| -rw-r--r-- | src/pacman/sync.c | 2 | ||||
| -rw-r--r-- | src/pacman/upgrade.c | 2 | ||||
| -rw-r--r-- | src/util/testpkg.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/pacman/query.c b/src/pacman/query.c index c12aa91f..06fd704a 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -552,7 +552,7 @@ int pacman_query(alpm_list_t *targets) char *strname = alpm_list_getdata(i); if(config->op_q_isfile) { - alpm_pkg_load(strname, 1, PM_PGP_VERIFY_OPTIONAL, &pkg); + alpm_pkg_load(config->handle, strname, 1, PM_PGP_VERIFY_OPTIONAL, &pkg); } else { pkg = alpm_db_get_pkg(db_local, strname); } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 57fec4bc..be6f147f 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -220,7 +220,7 @@ static int sync_cleancache(int level) /* attempt to load the package, prompt removal on failures as we may have * files here that aren't valid packages. we also don't need a full * load of the package, just the metadata. */ - if(alpm_pkg_load(path, 0, PM_PGP_VERIFY_NEVER, &localpkg) != 0 + if(alpm_pkg_load(config->handle, path, 0, PM_PGP_VERIFY_NEVER, &localpkg) != 0 || localpkg == NULL) { if(yesno(_("File %s does not seem to be a valid package, remove it?"), path)) { diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index fe49d882..8db88265 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -76,7 +76,7 @@ int pacman_upgrade(alpm_list_t *targets) char *targ = alpm_list_getdata(i); pmpkg_t *pkg; - if(alpm_pkg_load(targ, 1, check_sig, &pkg) != 0) { + if(alpm_pkg_load(config->handle, targ, 1, check_sig, &pkg) != 0) { pm_fprintf(stderr, PM_LOG_ERROR, "'%s': %s\n", targ, alpm_strerrorlast()); trans_release(); diff --git a/src/util/testpkg.c b/src/util/testpkg.c index 32011d46..5b8831de 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) /* let us get log messages from libalpm */ alpm_option_set_logcb(handle, output_cb); - if(alpm_pkg_load(argv[1], 1, PM_PGP_VERIFY_OPTIONAL, &pkg) == -1 + if(alpm_pkg_load(handle, argv[1], 1, PM_PGP_VERIFY_OPTIONAL, &pkg) == -1 || pkg == NULL) { switch(pm_errno) { case PM_ERR_PKG_OPEN: |