diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-07 20:39:52 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-09 21:24:45 +0200 |
| commit | ff8e519d4b011a6f23c0366d45c396fcd1f9af97 (patch) | |
| tree | 6f2bf414a30d7b1868dc113997e9fc03d32704c8 | |
| parent | 7d27cf8364b9c5d9a8d89017173f8c88d40cedd5 (diff) | |
| download | pacman-ff8e519d4b011a6f23c0366d45c396fcd1f9af97.tar.gz pacman-ff8e519d4b011a6f23c0366d45c396fcd1f9af97.tar.xz | |
Require handle for alpm_sync_sysupgrade()
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | lib/libalpm/alpm.h | 3 | ||||
| -rw-r--r-- | lib/libalpm/sync.c | 5 | ||||
| -rw-r--r-- | src/pacman/sync.c | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 50ab06ef..21444017 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -858,10 +858,11 @@ int alpm_trans_release(pmhandle_t *handle); /** @{ */ /** Search for packages to upgrade and add them to the transaction. + * @param handle the context handle * @param enable_downgrade allow downgrading of packages if the remote version is lower * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -int alpm_sync_sysupgrade(int enable_downgrade); +int alpm_sync_sysupgrade(pmhandle_t *handle, int enable_downgrade); /** Add a package to the transaction. * If the package was loaded by alpm_pkg_load(), it will be freed upon diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 41f9f996..16be6d9a 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -50,9 +50,6 @@ #include "diskspace.h" #include "signing.h" -/* global handle variable */ -extern pmhandle_t *handle; - /** Check for new version of pkg in sync repos * (only the first occurrence is considered in sync) */ @@ -85,7 +82,7 @@ pmpkg_t SYMEXPORT *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync) } /** Search for packages to upgrade and add them to the transaction. */ -int SYMEXPORT alpm_sync_sysupgrade(int enable_downgrade) +int SYMEXPORT alpm_sync_sysupgrade(pmhandle_t *handle, int enable_downgrade) { alpm_list_t *i, *j, *k; pmtrans_t *trans; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 6f8508ec..4cd8d212 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -760,7 +760,7 @@ static int sync_trans(alpm_list_t *targets) if(config->op_s_upgrade) { printf(_(":: Starting full system upgrade...\n")); alpm_logaction(config->handle, "starting full system upgrade\n"); - if(alpm_sync_sysupgrade(config->op_s_upgrade >= 2) == -1) { + if(alpm_sync_sysupgrade(config->handle, config->op_s_upgrade >= 2) == -1) { pm_fprintf(stderr, PM_LOG_ERROR, "%s\n", alpm_strerrorlast()); retval = 1; goto cleanup; |