external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

aurblup: update for pacman 4 revised libalpm API

Browse source 
Notable changes include the necessary handle object and the splitting
of provides and replaces into alpm_depend_t objects.

Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Dan McGee 2011-10-21 15:58:04 -05:00 • committed by Lukas Fleischer
parent d20f90ead3
commit 99a2bb81cf
1 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
scripts/aurblup/aurblup.c
View file

@ -11,7 +11,7 @@
#include "config.h" #include "config.h"
#define alpm_die(...) die(__VA_ARGS__, alpm_strerrorlast()); #define alpm_die(...) die(__VA_ARGS__, alpm_strerror(alpm_errno(handle)));
#define mysql_die(...) die(__VA_ARGS__, mysql_error(c)); #define mysql_die(...) die(__VA_ARGS__, mysql_error(c));
static void die(const char *, ...); static void die(const char *, ...);
@ -34,6 +34,8 @@ static char *mysql_db = NULL;
static MYSQL *c; static MYSQL *c;
static alpm_handle_t *handle;
static void static void
die(const char *format, ...) die(const char *format, ...)
{ {
@ -149,25 +151,29 @@ dblist_get_pkglist(alpm_list_t *dblist)
alpm_list_t *pkglist = NULL; alpm_list_t *pkglist = NULL;
for (d = dblist; d; d = alpm_list_next(d)) { for (d = dblist; d; d = alpm_list_next(d)) {
pmdb_t *db = d->data; alpm_db_t *db = d->data;
if (alpm_trans_init(0, NULL, NULL, NULL)) if (alpm_trans_init(handle, 0))
alpm_die("failed to initialize ALPM transaction: %s\n"); alpm_die("failed to initialize ALPM transaction: %s\n");
if (alpm_db_update(0, db) < 0) if (alpm_db_update(0, db) < 0)
alpm_die("failed to update ALPM database: %s\n"); alpm_die("failed to update ALPM database: %s\n");
if (alpm_trans_release()) if (alpm_trans_release(handle))
alpm_die("failed to release ALPM transaction: %s\n"); alpm_die("failed to release ALPM transaction: %s\n");
for (p = alpm_db_get_pkgcache(db); p; p = alpm_list_next(p)) { for (p = alpm_db_get_pkgcache(db); p; p = alpm_list_next(p)) {
pmpkg_t *pkg = p->data; alpm_pkg_t *pkg = p->data;
pkglist = pkglist_append(pkglist, alpm_pkg_get_name(pkg)); pkglist = pkglist_append(pkglist, alpm_pkg_get_name(pkg));
for (q = alpm_pkg_get_provides(pkg); q; q = alpm_list_next(q)) for (q = alpm_pkg_get_provides(pkg); q; q = alpm_list_next(q)) {
pkglist = pkglist_append(pkglist, q->data); alpm_depend_t *provide = q->data;
pkglist = pkglist_append(pkglist, provide->name);
}
for (q = alpm_pkg_get_replaces(pkg); q; q = alpm_list_next(q)) for (q = alpm_pkg_get_replaces(pkg); q; q = alpm_list_next(q)) {
pkglist = pkglist_append(pkglist, q->data); alpm_depend_t *replace = q->data;
pkglist = pkglist_append(pkglist, replace->name);
}
} }
} }
@ -182,20 +188,20 @@ dblist_create(void)
int i; int i;
for (i = 0; i < sizeof(alpm_repos) / sizeof(char *); i++) { for (i = 0; i < sizeof(alpm_repos) / sizeof(char *); i++) {
if (!alpm_db_register_sync(alpm_repos[i])) if (!alpm_db_register_sync(handle, alpm_repos[i], 0))
alpm_die("failed to register sync db \"%s\": %s\n", alpm_repos[i]); alpm_die("failed to register sync db \"%s\": %s\n", alpm_repos[i]);
} }
if (!(dblist = alpm_option_get_syncdbs())) if (!(dblist = alpm_option_get_syncdbs(handle)))
alpm_die("failed to get sync DBs: %s\n"); alpm_die("failed to get sync DBs: %s\n");
for (d = dblist; d; d = alpm_list_next(d)) { for (d = dblist; d; d = alpm_list_next(d)) {
pmdb_t *db = d->data; alpm_db_t *db = d->data;
char server[1024]; char server[1024];
snprintf(server, 1024, ALPM_MIRROR, alpm_db_get_name(db)); snprintf(server, 1024, ALPM_MIRROR, alpm_db_get_name(db));
if (alpm_db_setserver(db, server)) if (alpm_db_add_server(db, server))
alpm_die("failed to set server \"%s\": %s\n", server); alpm_die("failed to set server \"%s\": %s\n", server);
} }
@ -266,6 +272,7 @@ read_config(const char *fn)
static void static void
init(void) init(void)
{ {
enum _alpm_errno_t alpm_err;
if (mysql_library_init(0, NULL, NULL)) if (mysql_library_init(0, NULL, NULL))
mysql_die("could not initialize MySQL library: %s\n"); mysql_die("could not initialize MySQL library: %s\n");
if (!(c = mysql_init(NULL))) if (!(c = mysql_init(NULL)))
@ -274,12 +281,8 @@ init(void)
mysql_db, 0, mysql_socket, 0)) mysql_db, 0, mysql_socket, 0))
mysql_die("failed to initiate MySQL connection to %s: %s\n", mysql_host); mysql_die("failed to initiate MySQL connection to %s: %s\n", mysql_host);
if (alpm_initialize()) if ((handle = alpm_initialize("/", ALPM_DBPATH, &alpm_err)) == NULL)
alpm_die("failed to initialize ALPM: %s\n"); die("failed to initialize ALPM: %s\n", alpm_strerror(alpm_err));
if (alpm_option_set_root("/"))
alpm_die("failed to set ALPM root: %s\n");
if (alpm_option_set_dbpath(ALPM_DBPATH))
alpm_die("failed to set ALPM database path: %s\n");
} }
static void static void
@ -291,7 +294,7 @@ cleanup(void)
free(mysql_passwd); free(mysql_passwd);
free(mysql_db); free(mysql_db);
alpm_release(); alpm_release(handle);
mysql_close(c); mysql_close(c);
mysql_library_end(); mysql_library_end();
} }