bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Require handle for alpm_sync_sysupgrade()

Browse source 
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-06-07 13:39:52 -05:00
parent 7d27cf8364
commit ff8e519d4b
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/libalpm/alpm.h
View file

@ -858,10 +858,11 @@ int alpm_trans_release(pmhandle_t *handle);
/** @{ */ /** @{ */
/** Search for packages to upgrade and add them to the transaction. /** 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 * @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) * @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. /** Add a package to the transaction.
* If the package was loaded by alpm_pkg_load(), it will be freed upon * If the package was loaded by alpm_pkg_load(), it will be freed upon

5
lib/libalpm/sync.c
View file

@ -50,9 +50,6 @@
#include "diskspace.h" #include "diskspace.h"
#include "signing.h" #include "signing.h"
/* global handle variable */
extern pmhandle_t *handle;
/** Check for new version of pkg in sync repos /** Check for new version of pkg in sync repos
* (only the first occurrence is considered in sync) * (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. */ /** 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; alpm_list_t *i, *j, *k;
pmtrans_t *trans; pmtrans_t *trans;

2
src/pacman/sync.c
View file

@ -760,7 +760,7 @@ static int sync_trans(alpm_list_t *targets)
if(config->op_s_upgrade) { if(config->op_s_upgrade) {
printf(_(":: Starting full system upgrade...\n")); printf(_(":: Starting full system upgrade...\n"));
alpm_logaction(config->handle, "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()); pm_fprintf(stderr, PM_LOG_ERROR, "%s\n", alpm_strerrorlast());
retval = 1; retval = 1;
goto cleanup; goto cleanup;