- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Remove need to explicitly register the local DB
by Dan McGee 30 Jan '11

30 Jan '11

There is rarely a reason to ever not set up the local DB when getting a libalpm handle, so just do it automatically at this time. It is still a lazy initialization anyway, so there should be little to no fallout from doing it this way. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm.c | 4 ++++ lib/libalpm/alpm.h | 2 -- lib/libalpm/be_local.c | 7 +------ lib/libalpm/db.c | 15 --------------- src/pacman/database.c | 4 ++-- src/pacman/pacman.c | 9 --------- src/pacman/query.c | 11 +++++++++-- src/pacman/remove.c | 2 -- src/pacman/sync.c | 11 ++++++----- src/util/pactree.c | 2 +- src/util/testdb.c | 2 +- 11 files changed, 24 insertions(+), 45 deletions(-) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 2a9f460..7c3bfc2 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -54,6 +54,10 @@ int SYMEXPORT alpm_initialize(void) if(handle == NULL) { RET_ERR(PM_ERR_MEMORY, -1); } + if(_alpm_db_register_local() == NULL) { + /* error code should be set */ + return(-1); + } #ifdef ENABLE_NLS bindtextdomain("libalpm", LOCALEDIR); diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index a540bc4..95482f0 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -174,8 +174,6 @@ typedef enum _pmpkgreason_t { * Databases */ -/* Preferred interfaces db_register_local and db_register_sync */ -pmdb_t *alpm_db_register_local(void); pmdb_t *alpm_db_register_sync(const char *treename); int alpm_db_unregister(pmdb_t *db); int alpm_db_unregister_all(void); diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index ea59cec..9602c82 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -400,7 +400,7 @@ static int local_db_populate(pmdb_t *db) pkg = _alpm_pkg_new(); if(pkg == NULL) { closedir(dbdir); - return(-1); + RET_ERR(PM_ERR_MEMORY, -1); } /* split the db entry name */ if(_alpm_splitname(name, pkg) != 0) { @@ -900,11 +900,6 @@ pmdb_t *_alpm_db_register_local(void) ALPM_LOG_FUNC; - if(handle->db_local != NULL) { - _alpm_log(PM_LOG_WARNING, _("attempt to re-register the 'local' DB\n")); - RET_ERR(PM_ERR_DB_NOT_NULL, NULL); - } - _alpm_log(PM_LOG_DEBUG, "registering local database\n"); db = _alpm_db_new("local", 1); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index bf9a70d..c80dcbb 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -64,21 +64,6 @@ pmdb_t SYMEXPORT *alpm_db_register_sync(const char *treename) return(_alpm_db_register_sync(treename)); } -/** Register the local package database. - * @return a pmdb_t* representing the local database, or NULL on error - */ -pmdb_t SYMEXPORT *alpm_db_register_local(void) -{ - ALPM_LOG_FUNC; - - /* Sanity checks */ - ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, NULL)); - /* Do not register a database if a transaction is on-going */ - ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, NULL)); - - return(_alpm_db_register_local()); -} - /* Helper function for alpm_db_unregister{_all} */ void _alpm_db_unregister(pmdb_t *db) { diff --git a/src/pacman/database.c b/src/pacman/database.c index 5fd33ea..36433f3 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -31,8 +31,6 @@ #include "conf.h" #include "util.h" -extern pmdb_t *db_local; - /** * @brief Modify the 'local' package database. * @@ -43,6 +41,7 @@ extern pmdb_t *db_local; int pacman_database(alpm_list_t *targets) { alpm_list_t *i; + pmdb_t *db_local; int retval = 0; pmpkgreason_t reason; @@ -65,6 +64,7 @@ int pacman_database(alpm_list_t *targets) return(1); } + db_local = alpm_option_get_localdb(); for(i = targets; i; i = alpm_list_next(i)) { char *pkgname = i->data; if(alpm_db_set_pkgreason(db_local, pkgname, reason) == -1) { diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index c267060..45500cf 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -57,7 +57,6 @@ #include "conf.h" #include "package.h" -pmdb_t *db_local; /* list of targets specified on command line */ static alpm_list_t *pm_targets; @@ -1433,14 +1432,6 @@ int main(int argc, char *argv[]) list_display("Targets :", pm_targets); } - /* Opening local database */ - db_local = alpm_db_register_local(); - if(db_local == NULL) { - pm_printf(PM_LOG_ERROR, _("could not register 'local' database (%s)\n"), - alpm_strerrorlast()); - cleanup(EXIT_FAILURE); - } - /* Log commandline */ if(needs_root()) { cl_to_log(argc, argv); diff --git a/src/pacman/query.c b/src/pacman/query.c index fc6a2a5..c79133d 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -37,8 +37,6 @@ #include "conf.h" #include "util.h" -extern pmdb_t *db_local; - static char *resolve_path(const char *file) { char *str = NULL; @@ -102,6 +100,7 @@ static int query_fileowner(alpm_list_t *targets) char *append; size_t max_length; alpm_list_t *t; + pmdb_t *db_local; /* This code is here for safety only */ if(targets == NULL) { @@ -117,6 +116,8 @@ static int query_fileowner(alpm_list_t *targets) append = path + strlen(path); max_length = PATH_MAX - (append - path) - 1; + db_local = alpm_option_get_localdb(); + for(t = targets; t; t = alpm_list_next(t)) { char *filename, *dname, *rpath; const char *bname; @@ -220,6 +221,7 @@ static int query_search(alpm_list_t *targets) { alpm_list_t *i, *searchlist; int freelist; + pmdb_t *db_local = alpm_option_get_localdb(); /* if we have a targets list, search for packages matching it */ if(targets) { @@ -286,6 +288,8 @@ static int query_group(alpm_list_t *targets) alpm_list_t *i, *j; char *grpname = NULL; int ret = 0; + pmdb_t *db_local = alpm_option_get_localdb(); + if(targets == NULL) { for(j = alpm_db_get_grpcache(db_local); j; j = alpm_list_next(j)) { pmgrp_t *grp = alpm_list_getdata(j); @@ -471,6 +475,7 @@ int pacman_query(alpm_list_t *targets) int match = 0; alpm_list_t *i; pmpkg_t *pkg = NULL; + pmdb_t *db_local; /* First: operations that do not require targets */ @@ -495,6 +500,8 @@ int pacman_query(alpm_list_t *targets) } } + db_local = alpm_option_get_localdb(); + /* operations on all packages in the local DB * valid: no-op (plain -Q), list, info, check * invalid: isfile, owns */ diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 52f92ec..82d1c38 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -31,8 +31,6 @@ #include "util.h" #include "conf.h" -extern pmdb_t *db_local; - /** * @brief Remove a specified list of packages. * diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 278f15e..7353f7e 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -37,8 +37,6 @@ #include "package.h" #include "conf.h" -extern pmdb_t *db_local; - /* if keep_used != 0, then the db files which match an used syncdb * will be kept */ static int sync_cleandb(const char *dbpath, int keep_used) { @@ -144,6 +142,7 @@ static int sync_cleancache(int level) { alpm_list_t *i; alpm_list_t *sync_dbs = alpm_option_get_syncdbs(); + pmdb_t *db_local = alpm_option_get_localdb(); int ret = 0; for(i = alpm_option_get_cachedirs(); i; i = alpm_list_next(i)) { @@ -295,7 +294,7 @@ static int sync_synctree(int level, alpm_list_t *syncs) return(success > 0); } -static void print_installed(pmpkg_t *pkg) +static void print_installed(pmdb_t *db_local, pmpkg_t *pkg) { const char *pkgname = alpm_pkg_get_name(pkg); const char *pkgver = alpm_pkg_get_version(pkg); @@ -316,6 +315,7 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) alpm_list_t *i, *j, *ret; int freelist; int found = 0; + pmdb_t *db_local = alpm_option_get_localdb(); for(i = syncs; i; i = alpm_list_next(i)) { pmdb_t *db = alpm_list_getdata(i); @@ -366,7 +366,7 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) printf(")"); } - print_installed(pkg); + print_installed(db_local, pkg); /* we need a newline and initial indent first */ printf("\n "); @@ -519,6 +519,7 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets) static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) { alpm_list_t *i, *j, *ls = NULL; + pmdb_t *db_local = alpm_option_get_localdb(); if(targets) { for(i = targets; i; i = alpm_list_next(i)) { @@ -556,7 +557,7 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) if (!config->quiet) { printf("%s %s %s", alpm_db_get_name(db), alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); - print_installed(pkg); + print_installed(db_local, pkg); printf("\n"); } else { printf("%s\n", alpm_pkg_get_name(pkg)); diff --git a/src/util/pactree.c b/src/util/pactree.c index 0ac3f24..6a10006 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -77,7 +77,7 @@ static int alpm_local_init(void) return(ret); } - db_local = alpm_db_register_local(); + db_local = alpm_option_get_localdb(); if(!db_local) { return(1); } diff --git a/src/util/testdb.c b/src/util/testdb.c index 96a123a..461cf23 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -136,7 +136,7 @@ static int check_localdb(void) { return(ret); } - db = alpm_db_register_local(); + db = alpm_option_get_localdb(); if(db == NULL) { fprintf(stderr, "error: could not register 'local' database (%s)\n", alpm_strerrorlast()); -- 1.7.3.5

5 7

[pacman-dev] Pacman Hooks
by Sascha Kruse 30 Jan '11

30 Jan '11

Hello, I used this https://wiki.archlinux.org/index.php/User:Allan/Pacman_Hooks as a Project to learn c (so keep that in mind when you criticize the patch :-) ). Anyway, here's an example config file: /etc/pacman.d/hooks.conf: [testhook] Package = lynx nano Package = vim When = PreRemove [fonts] File = usr/share/fonts/* When = PostUpgrade --------------------------------------------------- You can define more than one Package that triggers a hook, either separated by spaces in the "Package ="line, or in a separate "Package =" line or a mix of both. The "File = " argument can be anything that get matched by fnmatch(...). You can also use "Package" and "File" within the same hook. In this case either one of them will trigger the hook (in other words: Package || File). "When" can be one of the following: PreRemove, PostRemove, PreUpgrade, PostUpgrade, PreInstall or PostInstall. For each hook, there needs to be a corresponding file in /etc/pacman.d/hooks.d. pacman.d ├── hooks.conf ├── hooks.d │ ├── fonts* │ └── testhook* Things i don't like, but i don't really now how to fix those: - The global variable HOOK_LIST - The paths to hooks.d and hooks.conf are hardcoded - The parsing of the config file is really ugly - The "File" argument can't begin with a / because it is matched against alpm_pkg_get_data and that file-strings don't have the leading / Greetings, Sascha Kruse P.s I don't mind, if you say, that this is too broken to get included. >From 9ac289d0c495a05239441a8ffe33975f32c3ef97 Mon Sep 17 00:00:00 2001 From: Sascha Kruse <knopwob(a)googlemail.com> Date: Sat, 29 Jan 2011 15:00:55 +0100 Subject: [PATCH] hooks --- lib/libalpm/Makefile.am | 1 + lib/libalpm/add.c | 5 + lib/libalpm/alpm.c | 1 + lib/libalpm/hooks.c | 217 +++++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/hooks.h | 43 +++++++++ lib/libalpm/remove.c | 3 + lib/libalpm/trans.c | 2 + 7 files changed, 272 insertions(+), 0 deletions(-) create mode 100644 lib/libalpm/hooks.c create mode 100644 lib/libalpm/hooks.h diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index da663cb..f23da73 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -38,6 +38,7 @@ libalpm_la_SOURCES = \ graph.h \ group.h group.c \ handle.h handle.c \ + hooks.h hooks.c \ log.h log.c \ package.h package.c \ remove.h remove.c \ diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index d4c56de..5bb0b0f 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -48,6 +48,7 @@ #include "deps.h" #include "remove.h" #include "handle.h" +#include "hooks.h" /** Add a file target to the transaction. * @param target the name of the file target to add @@ -516,6 +517,7 @@ static int commit_single_pkg(pmpkg_t *newpkg, size_t pkg_current, _alpm_runscriptlet(handle->root, newpkg->origin_data.file, "pre_upgrade", newpkg->version, oldpkg->version, trans); } + _trigger_hooks(newpkg, "PreUpgrade"); } else { is_upgrade = 0; @@ -528,6 +530,7 @@ static int commit_single_pkg(pmpkg_t *newpkg, size_t pkg_current, _alpm_runscriptlet(handle->root, newpkg->origin_data.file, "pre_install", newpkg->version, NULL, trans); } + _trigger_hooks(newpkg, "PreInstall"); } /* we override any pre-set reason if we have alldeps or allexplicit set */ @@ -696,9 +699,11 @@ static int commit_single_pkg(pmpkg_t *newpkg, size_t pkg_current, _alpm_runscriptlet(handle->root, scriptlet, "post_upgrade", alpm_pkg_get_version(newpkg), oldpkg ? alpm_pkg_get_version(oldpkg) : NULL, trans); + _trigger_hooks(newpkg, "PostUpgrade"); } else { _alpm_runscriptlet(handle->root, scriptlet, "post_install", alpm_pkg_get_version(newpkg), NULL, trans); + _trigger_hooks(newpkg, "PostInstall"); } } diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 2a9f460..e72de6d 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -63,6 +63,7 @@ int SYMEXPORT alpm_initialize(void) fetchConnectionCacheInit(5, 1); #endif + _parse_hooks_config(); return(0); } diff --git a/lib/libalpm/hooks.c b/lib/libalpm/hooks.c new file mode 100644 index 0000000..e1ecfab --- /dev/null +++ b/lib/libalpm/hooks.c @@ -0,0 +1,217 @@ +/* + * package.h + * + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#include "config.h" + +#include <alpm.h> +#include <alpm_list.h> +#include <stdio.h> +#include <string.h> +#include <ctype.h> +#include <stdlib.h> +#include <fnmatch.h> +/* pacman */ +#include "package.h" +#include "util.h" +#include "hooks.h" + + +int _run_hook(hook_t *hook) +{ + char *cmd; + int retval; + + cmd = malloc(strlen("/etc/pacman.d/hooks.d/") + strlen(hook->name) + 1); + sprintf(cmd, "/etc/pacman.d/hooks.d/%s", hook->name); + + retval = system(cmd); + if(retval == -1) { + } else if(retval != 0) { + } + return (retval); +} + +void _run_postponed_hooks(void) +{ + hook_t *hook; + alpm_list_t *i; + + for(i = HOOK_LIST; i; i = alpm_list_next(i)) { + hook = alpm_list_getdata(i); + if(hook->triggered) { + _run_hook(hook); + } + } +} + +void _trigger_hooks(pmpkg_t *pkg, char *when) +{ + hook_t *hook; + alpm_list_t *i, *j, *k; + alpm_list_t *pkgfiles; + const char *pkgname; + + pkgname = alpm_pkg_get_name(pkg); + pkgfiles = alpm_pkg_get_files(pkg); + + for(i = HOOK_LIST; i; i = alpm_list_next(i)) { + hook = alpm_list_getdata(i); + + /* trigger package based hooks */ + if(strcmp(hook->when, when) == 0 || + strcmp(hook->when, "Transaction") == 0) { + for(j = hook->pkg_triggers; j; j = alpm_list_next(j)) { + if(strcmp(pkgname, alpm_list_getdata(j)) == 0) { + if(strcmp(when, "Install") == 0 + || strcmp(when, "PostInstall") == 0 + || strcmp(when, "PreRemove") == 0) { + _run_hook(hook); + return; + } else { + hook->triggered++; + return; + } + } + } + + /* trigger file based hooks */ + for(j = hook->file_triggers; j; j = alpm_list_next(j)) { + for(k = pkgfiles; k; k = alpm_list_next(k)) { + if(fnmatch(alpm_list_getdata(j), alpm_list_getdata(k), 0) == 0) { + if(strcmp(when, "Install") == 0 + || strcmp(when, "PostInstall") == 0 + || strcmp(when, "PreRemove") == 0) { + _run_hook(hook); + return; + } else { + hook->triggered++; + return; + } + } + } + } + } + } +} + +int _parse_hooks_config(void) +{ + FILE *config; + char linebuf[128]; + char *cur, *look_ahead, *tmp, *key, *value; + + hook_t *tmp_hook = NULL; + + + config = fopen("/etc/pacman.d/hooks.conf", "r"); + + HOOK_LIST = NULL; + + if(config == NULL) { + return (1); + } + + while(fgets(linebuf, 127, config)) { + /* skip over whitespaces */ + for(cur = linebuf; isspace(*cur) ; cur++); + + /* ignore lines beginning with '#' */ + if(*cur == '#') { + continue; + } + if(*cur == '\0') { + continue; + } + + if(*cur == '[') { + /* we enter a new section */ + if(tmp_hook != NULL) { + /* ignore packages without name */ + if(tmp_hook->name != NULL) { + HOOK_LIST = alpm_list_add(HOOK_LIST, tmp_hook); + } + } + tmp_hook = malloc(sizeof(hook_t)); + tmp_hook->name = NULL; + tmp_hook->pkg_triggers = NULL; + tmp_hook->file_triggers = NULL; + tmp_hook->triggered = 0; + tmp_hook->when = 0; + + cur++; + for(look_ahead = cur; *look_ahead != ']' && *look_ahead != '\0'; look_ahead++); + if(*look_ahead == '\0') { + return (2); + } + + tmp_hook->name = malloc(look_ahead - cur + 1); + strncpy(tmp_hook->name, cur, look_ahead - cur); + tmp_hook->name[look_ahead - cur] = '\0'; + continue; + } + + key = cur; + value = strstr(linebuf, "="); + if(value == NULL) { + return (2); + } + + value++; + for(; isspace(*value) && *value != '\0'; value++); + if(*value == '\0') { + return 2; + } + + if(strncmp("Package", key, strlen("Package")) == 0) { + while(*value != '\0') { + for(look_ahead = value; isalnum(*look_ahead); look_ahead++); + tmp = malloc(look_ahead - value + 1); + strncpy(tmp, value, look_ahead - value); + tmp[look_ahead - value] = '\0'; + tmp_hook->pkg_triggers = alpm_list_add(tmp_hook->pkg_triggers, tmp); + tmp = NULL; + value = look_ahead+1; + /* skip whitespaces */ + for(; isspace(*value) ; value++); + } + } + + if(strncmp("File", key, strlen("File")) == 0) { + for(look_ahead = value; *look_ahead != '\n'; look_ahead++); + tmp = malloc(look_ahead - value + 1); + strncpy(tmp, value, look_ahead - value); + tmp[look_ahead - value + 1] = '\0'; + tmp_hook->file_triggers = alpm_list_add(tmp_hook->file_triggers, tmp); + } + if(strncmp("When", key, strlen("When")) == 0) { + for(look_ahead = value; isalnum(*look_ahead); look_ahead++); + tmp_hook->when = malloc(look_ahead - value + 1); + strncpy(tmp_hook->when, value, look_ahead - value); + tmp_hook->when[look_ahead - value] = '\0'; + } + } + if(tmp_hook != NULL) { + /* ignore hooks without name */ + if(tmp_hook->name != NULL) { + HOOK_LIST = alpm_list_add(HOOK_LIST, tmp_hook); + } + } + return 0; +} +/* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/hooks.h b/lib/libalpm/hooks.h new file mode 100644 index 0000000..15bd47e --- /dev/null +++ b/lib/libalpm/hooks.h @@ -0,0 +1,43 @@ +/* + * package.h + * + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef _PM_HOOKS_H +#define _PM_HOOKS_H + +#include <alpm.h> + +typedef struct hook { + char *name; + alpm_list_t *pkg_triggers; + alpm_list_t *file_triggers; + int triggered; + char *when; +} hook_t; + +/* global Variables */ +alpm_list_t *HOOK_LIST; + + +void _run_postponed_hooks(void); +void _trigger_hooks(pmpkg_t *pkg, char *when); +int _parse_hooks_config(void); +#endif /* _PM_HOOKS_H */ + +/* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 5fba0b0..3bd32e2 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -45,6 +45,7 @@ #include "deps.h" #include "handle.h" #include "alpm.h" +#include "hooks.h" int SYMEXPORT alpm_remove_target(const char *target) { @@ -409,6 +410,7 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db) _alpm_runscriptlet(handle->root, scriptlet, "pre_remove", alpm_pkg_get_version(info), NULL, trans); } + _trigger_hooks(info, "PreRemove"); if(!(trans->flags & PM_TRANS_FLAG_DBONLY)) { alpm_list_t *files = alpm_pkg_get_files(info); @@ -454,6 +456,7 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db) _alpm_runscriptlet(handle->root, scriptlet, "post_remove", alpm_pkg_get_version(info), NULL, trans); } + _trigger_hooks(info, "PostRemve"); /* remove the package from the database */ _alpm_log(PM_LOG_DEBUG, "updating database\n"); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 804ab7a..64b6e7d 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -45,6 +45,7 @@ #include "sync.h" #include "alpm.h" #include "deps.h" +#include "hooks.h" /** \addtogroup alpm_trans Transaction Functions * @brief Functions to manipulate libalpm transactions @@ -209,6 +210,7 @@ int SYMEXPORT alpm_trans_commit(alpm_list_t **data) return(-1); } } + _run_postponed_hooks(); trans->state = STATE_COMMITED; -- 1.7.3.5

3 5

[pacman-dev] [PATCH 1/4] pactest: allow checking for cache file existence
by Dan McGee 30 Jan '11

30 Jan '11

This will allow some tests to be added for cache cleaning. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- test/pacman/pmrule.py | 7 +++++++ test/pacman/pmtest.py | 19 ++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py index 6263045..c68d085 100755 --- a/test/pacman/pmrule.py +++ b/test/pacman/pmrule.py @@ -146,6 +146,13 @@ def check(self, test): else: print "FILE rule '%s' not found" % case success = -1 + elif kind == "CACHE": + cachedir = os.path.join(test.root, util.PM_CACHEDIR) + if case == "EXISTS": + pkg = test.findpkg(key, value, allow_local=True) + if not pkg or not os.path.isfile( + os.path.join(cachedir, pkg.filename())): + success = 0 else: print "Rule kind '%s' not found" % kind success = -1 diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index 958e263..82dfda6 100755 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -55,6 +55,22 @@ def addpkg(self, pkg): """ self.localpkgs.append(pkg) + def findpkg(self, name, version, allow_local=False): + """Find a package object matching the name and version specified in + either sync databases or the local package collection. The local database + is allowed to match if allow_local is True.""" + for db in self.db.itervalues(): + if db.treename == "local" and not allow_local: + continue + pkg = db.getpkg(name) + if pkg and pkg.version == version: + return pkg + for pkg in self.localpkgs: + if pkg.name == name and pkg.version == version: + return pkg + + return None + def addrule(self, rulename): """ """ @@ -76,6 +92,7 @@ def load(self): "local": pmdb.pmdb("local", self.root) } self.localpkgs = [] + self.createlocalpkgs = False self.filesystem = [] self.description = "" @@ -131,7 +148,7 @@ def generate(self): vprint("\t%s" % os.path.join(util.TMPDIR, pkg.filename())) pkg.makepkg(tmpdir) for key, value in self.db.iteritems(): - if key == "local": + if key == "local" and not self.createlocalpkgs: continue for pkg in value.pkgs: vprint("\t%s" % os.path.join(util.PM_CACHEDIR, pkg.filename())) -- 1.7.3.5

2 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.3-301-ge263cf7
by dan＠archlinux.org 29 Jan '11

29 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via e263cf7231c5d6ec41a15cd6230dbd794b58287a (commit) via 05f2abfba9d9e9055c5a2d0d7ae92d24f0dd1a2f (commit) via 2dd53e50de4f80cef84cd90140c4b43633360372 (commit) via 00fec5e2503a8272ebac9f240e03d655131ec216 (commit) via 2a90dbe3a8f58c2fc50d8bcd8136fbced659b734 (commit) via eed7ba92e849edbd5505baa2c1d4864d0490fa80 (commit) via 4a72c0964abc4b4836c2aafb9c59716299215802 (commit) via 953e0d48d7e6e3703bdaccef4ec2a8bbdbe460ed (commit) via f2fcf7eeb10dafec06d5d7d853b681f2e9fde45a (commit) via 1767a569c65ad1067eac7dcd1d9665e55767e50e (commit) via fb7e1b4b9bf7d2dbcd89a4832067d89a03d71056 (commit) via b8590ed634babc060b35e2ad7a035347234d836a (commit) via 4097c98c1ee65d6b3a659d042c6c84e0632673bf (commit) from ba97a22ce10df2966a9e1117b48a84b93eae0538 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e263cf7231c5d6ec41a15cd6230dbd794b58287a Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 17 19:45:31 2010 +0200 alpm: drop old target interfaces It's likely that these interfaces will break sooner or later, now that pacman no longer uses them. So better force the two people who use them to migrate their code to the new add_pkg/remove_pkg interface, which is very easy anyway. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit 05f2abfba9d9e9055c5a2d0d7ae92d24f0dd1a2f Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 17 19:14:41 2010 +0200 select_display: per-database output This function is used both for provision and group selection. Now the database name will be displayed. $ pacman -S base-devel :: There are 11 members in group base-devel: :: Repository testing 1) make :: Repository core 2) autoconf 3) automake 4) bison 5) fakeroot 6) flex 7) gcc 8) libtool 9) m4 10) patch 11) pkg-config Which ones do you want to install? Enter a number (default=all): Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit 2dd53e50de4f80cef84cd90140c4b43633360372 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 17 17:18:36 2010 +0200 pacman: improve select-question Make use of parseindex like in multiselect, and loop until we get a valid answer like in multiselect. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit 00fec5e2503a8272ebac9f240e03d655131ec216 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 17 17:09:25 2010 +0200 pacman/sync: implement interactive group selection Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit 2a90dbe3a8f58c2fc50d8bcd8136fbced659b734 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 17 11:18:53 2010 +0200 alpm: deprecate old interface Old interface is marked as deprecated: int alpm_sync_target(char *target); int alpm_sync_dbtarget(char *db, char *target); int alpm_add_target(char *target); int alpm_remove_target(char *target); New recommended interface: int alpm_add_pkg(pmpkg_t *pkg); int alpm_remove_pkg(pmpkg_t *pkg); Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit eed7ba92e849edbd5505baa2c1d4864d0490fa80 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 17 11:18:01 2010 +0200 pacman/remove: switch to new alpm_remove_pkg interface Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit 4a72c0964abc4b4836c2aafb9c59716299215802 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 17 11:16:27 2010 +0200 pacman/upgrade: switch to new interface Note that there is a behavior change here : if the same package name appeared several times in the target list, the alpm_add_target interface chooses the new package, while alpm_add_pkg returns PKG_DUP. I don't see why we cannot unify the behavior of -S and -U, and just choose one behavior that applies to both. Otherwise, it's always possible to handle these different behaviors in the frontend, it just requires more work. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit 953e0d48d7e6e3703bdaccef4ec2a8bbdbe460ed Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 17 11:14:43 2010 +0200 alpm: new alpm_remove_pkg interface For consistency with alpm_add_pkg. The new recommended interface is alpm_add_pkg / alpm_remove_pkg, all others interfaces are deprecated. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit f2fcf7eeb10dafec06d5d7d853b681f2e9fde45a Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 17 01:08:34 2010 +0200 pacman/sync: rewrite target handling This uses the new public functions to handle targets from the frontend, like it used to be : 1) alpm_find_dbs_satisfier to find (optionally versioned) package or provision 2) alpm_find_grp_pkgs to find members for a groups 3) alpm_add_pkg to finally add the pmpkg_t from 1 or 2 Of course, this adds more code to the frontend, but it completely deprecates sync_target and sync_dbtarget interfaces. This all-in-one interfaces felt wrong and left no control to the frontend. A good frontend should just use alpm_add_pkg, with pkg coming from alpm_db_get_pkg (for normal targets), alpm_find_dbs_satisfier (for versioned provisions) or alpm_find_grp_pkgs (for groups). This also opens the way to provide a better group handling in pacman without constraint from libalpm and callbacks. In ignore006, only the retcode changes, because no package was found to satisfy the target (the only possible package is ignored). Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit 1767a569c65ad1067eac7dcd1d9665e55767e50e Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 17 00:59:53 2010 +0200 alpm: add alpm_find_grp_pkgs This group function is meant to help group handling from frontend : it scans all dbs, handling ignored packages and duplicate members (the first repo where a member is found has the priority). Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit fb7e1b4b9bf7d2dbcd89a4832067d89a03d71056 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 17 00:57:37 2010 +0200 alpm: new alpm_add_pkg interface This new function is meant to deprecate all existing sync/add target functions : int alpm_sync_target(char *target); int alpm_sync_dbtarget(char *db, char *target); int alpm_add_target(char *target); Rather than dropping these 3 interfaces, it might be better to rewrite them using alpm_add_pkg for now. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit b8590ed634babc060b35e2ad7a035347234d836a Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 17 00:52:13 2010 +0200 alpm/dep: add alpm_find_dbs_satisfier This is a public interface for resolvedep. It looks nicer to expose it this way rather than through sync_target. This function can also be helpful for external tools as it should give good results close to how pacman select a package for satisfying a given dep. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit 4097c98c1ee65d6b3a659d042c6c84e0632673bf Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sat Oct 16 12:28:01 2010 +0200 Add interactive provider selection If there are multiple providers in one db, pacman used to just stop at the first one (both during dependency resolution or for pacman -S 'provision' which uses the same code). This adds a new conversation callback so that the user can choose which provider to install. By default (user press enter or --noconfirm), the first provider is still chosen, so for example the behavior of sync402 and 403 is preserved. But at least the user now has the possibility to make the right choice in a manual run. If one of the provider is already installed, it is picked for reinstall/upgrade, so that provision 002/003 pactest now pass. $ pacman -S community/smtp-server :: There are 3 providers available for smtp-server: 1) courier-mta 2) esmtp 3) exim Which one do you want to install? Enter a number (default=1): Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 65 +++++++------ lib/libalpm/alpm.h | 9 +- lib/libalpm/deps.c | 60 +++++++++++- lib/libalpm/remove.c | 35 ++----- lib/libalpm/sync.c | 193 ++++++------------------------------- src/pacman/callback.c | 12 +++ src/pacman/remove.c | 33 ++++++- src/pacman/sync.c | 108 ++++++++++++++++++--- src/pacman/upgrade.c | 11 ++- src/pacman/util.c | 184 +++++++++++++++++++++++++++++++++++ src/pacman/util.h | 3 + test/pacman/tests/ignore006.py | 2 +- test/pacman/tests/provision002.py | 2 - test/pacman/tests/provision003.py | 2 - 14 files changed, 470 insertions(+), 249 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.3-2-g272f7cf
by dan＠archlinux.org 29 Jan '11

29 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 272f7cf25e9a12268f23a6018000625630026434 (commit) from f95080884ca4b9a952ef02057c0c62cf2228f79e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/de.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.3-288-gba97a22
by dan＠archlinux.org 29 Jan '11

29 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via ba97a22ce10df2966a9e1117b48a84b93eae0538 (commit) via ce089e1b975e99f6a35c159f51d0dbe7c0ddcca3 (commit) via ef86da97f54a90ee4ba3ba8ea7963135e7bae8ed (commit) via 9b876fff09f2af10cba6824bec03d8fe3e167b5b (commit) via 272f7cf25e9a12268f23a6018000625630026434 (commit) via f95080884ca4b9a952ef02057c0c62cf2228f79e (commit) from 7f93f0620c44a811aa7989f6d2ed1bf4ba275d62 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ba97a22ce10df2966a9e1117b48a84b93eae0538 Merge: ce089e1 272f7cf Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 29 12:16:11 2011 -0600 Merge branch 'maint' commit ce089e1b975e99f6a35c159f51d0dbe7c0ddcca3 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 29 11:23:55 2011 -0600 pactest: pass entire test to rule.check() We were piecemeal passing fields from the test object in and it was getting out of hand, and future work would have added yet another argument. Instead, just pass the entire test object and entrust the rule to get what it needs. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ef86da97f54a90ee4ba3ba8ea7963135e7bae8ed Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 28 17:41:15 2011 -0600 Remove need to explicitly register the local DB Perform the cheap struct and string setup of the local DB at handle initialization time to match the teardown we do when releasing the handle. If the local DB is not needed, all real initialization is done lazily after DB paths and other things have been configured anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9b876fff09f2af10cba6824bec03d8fe3e167b5b Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 28 17:34:06 2011 -0600 Ignore known but unused package descfile fields We explicitly place 'pkgbase' (and used to place 'force') fields inside PKGINFO files, so ignore them silently instead of printing an error for them. Also make the error message for unknown keys actually contain the key. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: etc/pacman.conf.in | 2 +- lib/libalpm/alpm.c | 4 ++++ lib/libalpm/alpm.h | 2 -- lib/libalpm/be_local.c | 7 +------ lib/libalpm/be_package.c | 8 ++++++-- lib/libalpm/db.c | 15 --------------- lib/libalpm/po/de.po | 2 +- src/pacman/database.c | 4 ++-- src/pacman/pacman.c | 9 --------- src/pacman/query.c | 11 +++++++++-- src/pacman/remove.c | 2 -- src/pacman/sync.c | 11 ++++++----- src/util/pactree.c | 2 +- src/util/testdb.c | 2 +- test/pacman/pmrule.py | 22 +++++++++++----------- test/pacman/pmtest.py | 2 +- 16 files changed, 44 insertions(+), 61 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libalpm: Fix a missing "nicht" (not) in German translation.
by Thomas Bächler 28 Jan '11

28 Jan '11

--- lib/libalpm/po/de.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po index c1c6a0b..c90d52a 100644 --- a/lib/libalpm/po/de.po +++ b/lib/libalpm/po/de.po @@ -205,7 +205,7 @@ msgstr "Konnte Datei '%s' nicht von %s übertragen : %s\n" #, c-format msgid "resuming download of %s not possible; starting over\n" -msgstr "Kann den Download von %s wieder aufnehmen, starte neu\n" +msgstr "Kann den Download von %s nicht wieder aufnehmen, starte neu\n" #, c-format msgid "error writing to file '%s': %s\n" -- 1.7.3.5

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.3-282-g7f93f06
by dan＠archlinux.org 28 Jan '11

28 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 7f93f0620c44a811aa7989f6d2ed1bf4ba275d62 (commit) from fe76c353af6d91ce9f225dc2b0195a689f6790da (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7f93f0620c44a811aa7989f6d2ed1bf4ba275d62 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 28 11:38:58 2011 -0600 Fix libtool performance regression with many arguments Reported and fixed upstream, patching our version for now until a future release fixes it: * http://lists.gnu.org/archive/html/bug-libtool/2011-01/msg00007.html * http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=286e87b1030c353d9cf… Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: ltmain.sh | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.3-1-gf950808
by dan＠archlinux.org 28 Jan '11

28 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via f95080884ca4b9a952ef02057c0c62cf2228f79e (commit) from a97e28205a462a7433a8d0e7061cd911ea3d8c4c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f95080884ca4b9a952ef02057c0c62cf2228f79e Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 28 11:58:21 2011 -0600 Enable failure on server error for curl download command This will make a 404 a silent failure that returns an error code rather than 0 as was previously done, screwing up the logic used by pacman/libalpm to allow moving onto the next server on a failed download. Fixes FS#22630. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: etc/pacman.conf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

Re: [pacman-dev] Errors while KDE 4.6 upgrading
by Pierre Schmitz 27 Jan '11

27 Jan '11

On Thu, 27 Jan 2011 14:42:36 +0100, Andrea Scarpino wrote: > On Thursday 27 January 2011 13:31:19 Pierre Schmitz wrote: >> They do. And to make sure I just added a specific test to prove it. I >> assume dbscripts weren't used here. > I removed the packages from pool/ to get it working. > > I know this was wrong, but there was no need to bump pkgrel in this case > because kde-meta was already in [kde-unstable] and only [extra] users would > have installed it. > > Will not happen again. Rule of thumb: never change a package without bumping the pkgrel And: don't try to cheat dbscripts. If it tells you something is wrong it is most likely right. So, please update that package and bump the pkgrel (note: use an integer and not an decimal). It just an empty package anyway. -- Pierre Schmitz, https://users.archlinux.de/~pierre

1 0