- 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

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

27 Jan '11

On 27/01/11 20:37, Andrea Scarpino wrote: > On Thursday 27 January 2011 13:28:24 Sergej Pupykin wrote: >> Why pacman think that file is corrupted when I do -Syu and does not >> think so when I do -U ... ? > Because I rebuilt them and re-added them (there are no changes). Clean your > cache to fix this. Ugh... don't our db scripts stop you from doing this? Allan

3 2

[pacman-dev] Errors while KDE 4.6 upgrading
by Sergej Pupykin 27 Jan '11

27 Jan '11

Hi, Why pacman think that file is corrupted when I do -Syu and does not think so when I do -U ... ? $ pacman -Syu ..... :: File kde-meta-kdeadmin-4.6-1.2-any.pkg.tar.xz is corrupted. Do you want to delete it? [Y/n] n :: File kde-meta-kdeartwork-4.6-1.2-any.pkg.tar.xz is corrupted. Do you want to delete it? [Y/n] n :: File kde-meta-kdebase-4.6-1.2-any.pkg.tar.xz is corrupted. Do you want to delete it? [Y/n] n :: File kde-meta-kdeedu-4.6-1.2-any.pkg.tar.xz is corrupted. Do you want to delete it? [Y/n] n :: File kde-meta-kdegames-4.6-1.2-any.pkg.tar.xz is corrupted. Do you want to delete it? [Y/n] n :: File kde-meta-kdegraphics-4.6-1.2-any.pkg.tar.xz is corrupted. Do you want to delete it? [Y/n] n error: failed to commit transaction (invalid or corrupted package) kde-meta-kdeadmin-4.6-1.2-any.pkg.tar.xz is invalid or corrupted kde-meta-kdeartwork-4.6-1.2-any.pkg.tar.xz is invalid or corrupted kde-meta-kdebase-4.6-1.2-any.pkg.tar.xz is invalid or corrupted kde-meta-kdeedu-4.6-1.2-any.pkg.tar.xz is invalid or corrupted kde-meta-kdegames-4.6-1.2-any.pkg.tar.xz is invalid or corrupted kde-meta-kdegraphics-4.6-1.2-any.pkg.tar.xz is invalid or corrupted $ pacman -U /var/cache/pacman/pkg/kde-meta-kdeadmin-4.6-1.2-any.pkg.tar.xz ...... Proceed with installation? [Y/n] checking package integrity... (1/1) checking for file conflicts [###########################################] 100% (1/1) upgrading kde-meta-kdeadmin [###########################################] 100%

4 3

Re: [pacman-dev] Errors while KDE 4.6 upgrading
by Ionuț Bîru 27 Jan '11

27 Jan '11

On 01/27/2011 12:37 PM, Andrea Scarpino wrote: > On Thursday 27 January 2011 13:28:24 Sergej Pupykin wrote: >> Why pacman think that file is corrupted when I do -Syu and does not >> think so when I do -U ... ? > Because I rebuilt them and re-added them (there are no changes). Clean your > cache to fix this. > remember what i said about pacman 3.4 that would extract only the difference between databases? bump pkgrel every time you rebuild. pacman -Syy should fix his issue -- Ionuț

1 0

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

25 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 fe76c353af6d91ce9f225dc2b0195a689f6790da (commit) via 0f24390fe8967f25d7fce4665d5b635fa66a3c4f (commit) via d6a997ee383a8228a0f5bf18af56febb7b6bc189 (commit) from 27e8f06e0335ca560a3d0a261cc1979dbc1caad9 (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 fe76c353af6d91ce9f225dc2b0195a689f6790da Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 24 21:46:42 2011 -0600 Fix memory leak and error code in DB reading We were returning a package error code rather than a DB one, and we would leak the archive memory if the database file didn't exist. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0f24390fe8967f25d7fce4665d5b635fa66a3c4f Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 24 15:20:10 2011 -0600 pkgsearch: handle non-matching lines gracefully Before any non-matching line would trigger some perl warnings about undefined variables. If a line doesn't match, just show it to the user unprocessed; this is seen with warning and error messages pacman not so helpfully emits on stdout rather than stderr. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d6a997ee383a8228a0f5bf18af56febb7b6bc189 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 24 15:19:14 2011 -0600 Update contrib/ Makefile We didn't have the proper dependencies specified for our scripts after the move to *.in extensions, so a change to a file didn't trigger a rebuild. Also remove old stuff from .gitignore. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/.gitignore | 1 - contrib/Makefile.am | 10 ++++++++++ contrib/pacsearch.in | 12 +++++++++--- lib/libalpm/be_sync.c | 5 +++-- 4 files changed, 22 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Robson Peixoto invited you to Dropbox
by Dropbox 24 Jan '11

24 Jan '11

Robson Peixoto wants you to use Dropbox to sync and share files online and across computers. Get started here: http://www.dropbox.com/link/20.Ud2UoA8Uk3/NjYxNDQ4MDkyNw?src=referrals_ab_b… - The Dropbox Team ____________________________________________________ To stop receiving invites from Dropbox, please go to http://www.dropbox.com/bl/359c9af48b34/pacman-dev%40archlinux.org

6 6

[pacman-dev] [PATCH] Add interactive provider selection
by Xavier Chantry 23 Jan '11

23 Jan '11

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. $ 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> --- lib/libalpm/alpm.h | 1 + lib/libalpm/deps.c | 28 +++++++++++++++++++++- src/pacman/callback.c | 13 ++++++++++ src/pacman/util.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/util.h | 2 + 5 files changed, 103 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 237e235..d9e5439 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -379,6 +379,7 @@ typedef enum _pmtransconv_t { PM_TRANS_CONV_CORRUPTED_PKG = (1 << 3), PM_TRANS_CONV_LOCAL_NEWER = (1 << 4), PM_TRANS_CONV_REMOVE_PKGS = (1 << 5), + PM_TRANS_CONV_SELECT_PROVIDER = (1 << 6), } pmtransconv_t; /* Transaction Progress */ diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index cdaf524..f94f16c 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -510,6 +510,10 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, { alpm_list_t *i, *j; int ignored = 0; + + alpm_list_t *providers = NULL; + int count; + /* 1. literals */ for(i = dbs; i; i = i->next) { pmpkg_t *pkg = _alpm_db_get_pkgfromcache(i->data, dep->name); @@ -549,11 +553,31 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, continue; } } - _alpm_log(PM_LOG_WARNING, _("provider package was selected (%s provides %s)\n"), - pkg->name, dep->name); + _alpm_log(PM_LOG_DEBUG, "provider found (%s provides %s)\n", + pkg->name, dep->name); + providers = alpm_list_add(providers, pkg); + /* keep looking for other providers in the current db */ + } + } + /* if there is more than one provider, we ask the user */ + count = alpm_list_count(providers); + if(count == 1) { + pmpkg_t *pkg = alpm_list_getdata(alpm_list_first(providers)); + alpm_list_free(providers); + return(pkg); + } else if(count > 1) { + /* default to first provider if there is no QUESTION callback */ + int index = 0; + QUESTION(handle->trans, PM_TRANS_CONV_SELECT_PROVIDER, + providers, dep, NULL, &index); + if(index >= 0 && index < count) { + pmpkg_t *pkg = alpm_list_getdata(alpm_list_nth(providers, index)); + alpm_list_free(providers); return(pkg); } } + alpm_list_free(providers); + providers = NULL; } if(ignored) { /* resolvedeps will override these */ pm_errno = PM_ERR_PKG_IGNORED; diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 32dafb5..f54fe4a 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -296,6 +296,19 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, alpm_list_free(namelist); } break; + case PM_TRANS_CONV_SELECT_PROVIDER: + { + alpm_list_t *providers = (alpm_list_t *)data1; + int count = alpm_list_count(providers); + char *depstring = alpm_dep_compute_string((pmdepend_t *)data2); + printf(_(":: There are %d providers available for %s:\n"), count, + depstring); + free(depstring); + select_display(providers); + printf("\n"); + *response = select_question(count, _("Which one do you want to install?")); + } + break; case PM_TRANS_CONV_LOCAL_NEWER: if(!config->op_s_downloadonly) { *response = yesno(_(":: %s-%s: local version is newer. Upgrade anyway?"), diff --git a/src/pacman/util.c b/src/pacman/util.c index 5b4b2e8..0af36b4 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -686,6 +686,67 @@ void display_optdepends(pmpkg_t *pkg) } } +void select_display(const alpm_list_t *pkglist) +{ + const alpm_list_t *i; + int nth = 1; + alpm_list_t *list = NULL; + char *string = NULL; + + for (i = pkglist; i; i = i->next) { + string = NULL; + pm_asprintf(&string, "%d) %s", nth, alpm_pkg_get_name(i->data)); + list = alpm_list_add(list, string); + nth++; + } + list_display(" ", list); + FREELIST(list); +} + +int select_question(int count, char *fmt, ...) +{ + char response[32]; + FILE *stream; + va_list args; + int preset = 1; + + if(config->noconfirm) { + stream = stdout; + } else { + /* Use stderr so questions are always displayed when redirecting output */ + stream = stderr; + } + + va_start(args, fmt); + vfprintf(stream, fmt, args); + va_end(args); + + fprintf(stream, "\n"); + fprintf(stream, _("Enter a number (default=%d)"), preset); + fprintf(stream, ": "); + + if(config->noconfirm) { + fprintf(stream, "\n"); + return(preset-1); + } + + if(fgets(response, sizeof(response), stdin)) { + strtrim(response); + if(strlen(response) > 0) { + char *endptr = NULL; + int n = strtol(response, &endptr, 10); + if(*endptr == '\0' && n >= 1 && n <= count) { + return(n-1); + } else { + fprintf(stream, _("Invalid number: %s\n"), response); + return(-1); + } + } + } + return(preset-1); +} + + /* presents a prompt and gets a Y/N answer */ static int question(short preset, char *fmt, va_list args) { diff --git a/src/pacman/util.h b/src/pacman/util.h index 2e77b0c..7e25b55 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -58,6 +58,8 @@ void display_targets(const alpm_list_t *pkgs, int install); void display_new_optdepends(pmpkg_t *oldpkg, pmpkg_t *newpkg); void display_optdepends(pmpkg_t *pkg); void print_packages(const alpm_list_t *packages); +void select_display(const alpm_list_t *pkglist); +int select_question(int count, char *fmt, ...); int yesno(char *fmt, ...); int noyes(char *fmt, ...); int pm_printf(pmloglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); -- 1.7.3.1

4 8

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

22 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 27e8f06e0335ca560a3d0a261cc1979dbc1caad9 (commit) via 4d291508c2c24d058d0e00ca9588c6c81b24bc92 (commit) via d16a5ae7ddf358c45280a56bc81ed67841a7476f (commit) via 6e71922e6c918de9b60d2e9b1585835421738437 (commit) via a99e7272b8703e54b3c96ac0fdb7fe7eacfabbe8 (commit) via b3d71bf7d0ef8f577114bc39abecdc7ade0395dd (commit) via cda7d7847f3434959ef077ec6eb78ea4b2078a5a (commit) via c91bd3dda9540bb80f9e73fed87eee69b4675977 (commit) via 61864e1f6f51549c3b32c0d82b8c9deacea3ed73 (commit) from 32727efc38bf5376a402c4c4149cc4148ba2068b (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 27e8f06e0335ca560a3d0a261cc1979dbc1caad9 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 14:29:02 2011 -0600 Query fileowner performance improvements Clean up some of the code by doing less string copying and printing. This is accomplished by either doing it after we know we need it, or taking advantage of the fact that some strings never change such as the root directory prefix. Also, fix an issue where a file at the root level (e.g. /foobar) could not be queried. End result is a much faster user experience when combined with the mbasename() changes. These timings are for looking up 113 files in /etc/, some of which are owned and some which are not. $ find /etc -maxdepth 1 -type f | xargs time pacman -Qo >/dev/null 6.10user 0.05system 0:06.17elapsed 99%CPU (0avgtext+0avgdata 131040maxresident)k 0inputs+0outputs (0major+9436minor)pagefaults 0swaps $ find /etc -maxdepth 1 -type f | xargs time ./src/pacman/.libs/lt-pacman -Qo >/dev/null 0.86user 0.04system 0:00.92elapsed 99%CPU (0avgtext+0avgdata 131120maxresident)k 0inputs+0outputs (0major+9436minor)pagefaults 0swaps I'll take a 600% increase in speed. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4d291508c2c24d058d0e00ca9588c6c81b24bc92 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 14:20:42 2011 -0600 Improve mbasename performance Rather than roll our own, use strrchr() instead, which glibc may have a better implementation than the simple iteration method we were using. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d16a5ae7ddf358c45280a56bc81ed67841a7476f Merge: 6e71922 cda7d78 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 16:32:34 2011 -0600 Merge branch 'backup-status' commit 6e71922e6c918de9b60d2e9b1585835421738437 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 16:22:01 2011 -0600 Add a few new provides tests These deal with already-installed packages and how they should be the preferred provider in cases where provider selection now occurs. A few involve multiple sync repos. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a99e7272b8703e54b3c96ac0fdb7fe7eacfabbe8 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 16:11:33 2011 -0600 pactest: sort repos by alpha order in config file The order was non-deterministic before, and just happened to work for sync023.py as it was written. Ensure there is some sort of predictable ordering. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b3d71bf7d0ef8f577114bc39abecdc7ade0395dd Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 16:28:43 2011 -0600 pactest: use new-style python classes Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cda7d7847f3434959ef077ec6eb78ea4b2078a5a Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 11:38:34 2011 -0600 Be smarter about failure to read backup file contents Instead of always printing MISSING, we can switch on the errno value set by access() and print a more useful string. In this case, handle files we can't read by printing UNREADABLE, print MISSING on ENOENT, and print UNKNOWN for anything else. Fixes FS#22546. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c91bd3dda9540bb80f9e73fed87eee69b4675977 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 12 00:06:39 2011 -0600 Mark backup status strings as untranslated And also change "Not Modified" -> "UNMODIFIED" for consistency. This makes it a lot easier to machine-parse this and not worry about locale differences. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 61864e1f6f51549c3b32c0d82b8c9deacea3ed73 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 12 00:05:22 2011 -0600 Refactor backup file status check into separate function This will make it a lot easier to use this stuff elsewhere. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: src/pacman/package.c | 69 ++++++++++++++++++++++++------------- src/pacman/query.c | 48 +++++++++++++++++-------- src/pacman/util.c | 18 +++------- src/pacman/util.h | 2 +- test/pacman/pmdb.py | 2 +- test/pacman/pmenv.py | 2 +- test/pacman/pmfile.py | 2 +- test/pacman/pmpkg.py | 2 +- test/pacman/pmrule.py | 2 +- test/pacman/pmtest.py | 2 +- test/pacman/tests/provision002.py | 22 ++++++++++++ test/pacman/tests/provision003.py | 23 ++++++++++++ test/pacman/tests/provision004.py | 21 +++++++++++ test/pacman/tests/sync023.py | 3 +- test/pacman/util.py | 5 ++- 15 files changed, 162 insertions(+), 61 deletions(-) create mode 100644 test/pacman/tests/provision002.py create mode 100644 test/pacman/tests/provision003.py create mode 100644 test/pacman/tests/provision004.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 3/3] Be smarter about failure to read backup file contents
by dpmcgee＠gmail.com 22 Jan '11

22 Jan '11

From: Dan McGee <dan(a)archlinux.org> Instead of always printing MISSING, we can switch on the errno value set by access() and print a more useful string. In this case, handle files we can't read by printing UNREADABLE, print MISSING on ENOENT, and print UNKNOWN for anything else. Fixes FS#22546. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/package.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 68b0693..77a5ee7 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -25,6 +25,7 @@ #include <string.h> #include <unistd.h> #include <limits.h> +#include <errno.h> #include <wchar.h> #include <alpm.h> @@ -183,7 +184,16 @@ static const char *get_backup_file_status(const char *root, } free(md5sum); } else { - ret = "MISSING"; + switch(errno) { + case EACCES: + ret = "UNREADABLE"; + break; + case ENOENT: + ret = "MISSING"; + break; + default: + ret = "UNKNOWN"; + } } return(ret); } -- 1.7.3.5

1 0

[pacman-dev] [PATCH 2/3] Mark backup status strings as untranslated
by dpmcgee＠gmail.com 22 Jan '11

22 Jan '11

From: Dan McGee <dan(a)archlinux.org> And also change "Not Modified" -> "UNMODIFIED" for consistency. This makes it a lot easier to machine-parse this and not worry about locale differences. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/package.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 34eab22..68b0693 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -177,13 +177,13 @@ static const char *get_backup_file_status(const char *root, /* if checksums don't match, file has been modified */ if (strcmp(md5sum, expected_md5) != 0) { - ret = _("MODIFIED"); + ret = "MODIFIED"; } else { - ret = _("Not Modified"); + ret = "UNMODIFIED"; } free(md5sum); } else { - ret = _("MISSING"); + ret = "MISSING"; } return(ret); } -- 1.7.3.5

1 0

[pacman-dev] [PATCH 1/3] Refactor backup file status check into separate function
by dpmcgee＠gmail.com 22 Jan '11

22 Jan '11

From: Dan McGee <dan(a)archlinux.org> This will make it a lot easier to use this stuff elsewhere. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- In addition to the query fileowner speed improvements patches I just sent, this one is part of the logical path to implementing https://bugs.archlinux.org/task/19103. -Dan src/pacman/package.c | 59 +++++++++++++++++++++++++++++-------------------- 1 files changed, 35 insertions(+), 24 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 7af3843..34eab22 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -157,6 +157,37 @@ void dump_pkg_sync(pmpkg_t *pkg, const char *treename, int level) dump_pkg_full(pkg, -level); } +static const char *get_backup_file_status(const char *root, + const char *filename, const char *expected_md5) +{ + char path[PATH_MAX]; + char *ret; + + snprintf(path, PATH_MAX, "%s%s", root, filename); + + /* if we find the file, calculate checksums, otherwise it is missing */ + if(access(path, R_OK) == 0) { + char *md5sum = alpm_compute_md5sum(path); + + if(md5sum == NULL) { + pm_fprintf(stderr, PM_LOG_ERROR, + _("could not calculate checksums for %s\n"), path); + return(NULL); + } + + /* if checksums don't match, file has been modified */ + if (strcmp(md5sum, expected_md5) != 0) { + ret = _("MODIFIED"); + } else { + ret = _("Not Modified"); + } + free(md5sum); + } else { + ret = _("MISSING"); + } + return(ret); +} + /* Display list of backup files and their modification states */ void dump_pkg_backups(pmpkg_t *pkg) @@ -167,37 +198,17 @@ void dump_pkg_backups(pmpkg_t *pkg) if(alpm_pkg_get_backup(pkg)) { /* package has backup files, so print them */ for(i = alpm_pkg_get_backup(pkg); i; i = alpm_list_next(i)) { - char path[PATH_MAX]; + const char *value; char *str = strdup(alpm_list_getdata(i)); - char *ptr = index(str, '\t'); + char *ptr = strchr(str, '\t'); if(ptr == NULL) { free(str); continue; } *ptr = '\0'; ptr++; - snprintf(path, PATH_MAX-1, "%s%s", root, str); - /* if we find the file, calculate checksums, otherwise it is missing */ - if(access(path, R_OK) == 0) { - char *md5sum = alpm_compute_md5sum(path); - - if(md5sum == NULL) { - pm_fprintf(stderr, PM_LOG_ERROR, - _("could not calculate checksums for %s\n"), path); - free(str); - continue; - } - - /* if checksums don't match, file has been modified */ - if (strcmp(md5sum, ptr) != 0) { - printf(_("MODIFIED\t%s\n"), path); - } else { - printf(_("Not Modified\t%s\n"), path); - } - free(md5sum); - } else { - printf(_("MISSING\t\t%s\n"), path); - } + value = get_backup_file_status(root, str, ptr); + printf("%s\t%s%s\n", value, root, str); free(str); } } else { -- 1.7.3.5

1 0

[pacman-dev] [PATCH 1/2] Improve mbasename performance
by Dan McGee 22 Jan '11

22 Jan '11

Rather than roll our own, use strrchr() instead, which glibc may have a better implementation than the simple iteration method we were using. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/query.c | 4 ++-- src/pacman/util.c | 18 +++++------------- src/pacman/util.h | 2 +- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index dea309a..f599360 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -109,8 +109,8 @@ static int query_fileowner(alpm_list_t *targets) for(t = targets; t; t = alpm_list_next(t)) { int found = 0; filename = strdup(alpm_list_getdata(t)); - char *bname, *dname, *rpath; - const char *root; + char *dname, *rpath; + const char *root, *bname; struct stat buf; alpm_list_t *i, *j; diff --git a/src/pacman/util.c b/src/pacman/util.c index d91d1d4..0377bf7 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -157,25 +157,17 @@ int rmrf(const char *path) } /** Parse the basename of a program from a path. -* Grabbed from the uClibc source. * @param path path to parse basename from * * @return everything following the final '/' */ -char *mbasename(const char *path) +const char *mbasename(const char *path) { - const char *s; - const char *p; - - p = s = path; - - while (*s) { - if (*s++ == '/') { - p = s; - } + const char *last = strrchr(path, '/'); + if(last) { + return(last + 1); } - - return (char *)p; + return(path); } /** Parse the dirname of a program from a path. diff --git a/src/pacman/util.h b/src/pacman/util.h index a5c382d..78fe5b5 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -44,7 +44,7 @@ int trans_release(void); int needs_root(void); int getcols(void); int rmrf(const char *path); -char *mbasename(const char *path); +const char *mbasename(const char *path); char *mdirname(const char *path); void indentprint(const char *str, int indent); char *strtoupper(char *str); -- 1.7.3.5

1 1

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.4.3, created. v3.4.3
by dan＠archlinux.org 22 Jan '11

22 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 annotated tag, v3.4.3 has been created at 425131aa2aab964d43b4018f5939d2bbfa640aec (tag) tagging a97e28205a462a7433a8d0e7061cd911ea3d8c4c (commit) replaces v3.4.2 tagged by Dan McGee on Sat Jan 22 10:10:32 2011 -0600 - Log ----------------------------------------------------------------- Group ignores, unfix epoch, double remove issue -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk07AcAACgkQXC5GoPU6du2/jQCbBpHgV/DQ9N2bPsm+J5HCdPl+ f8MAoK0lz5QtAZ3mxiwMyqZwfHnsXSjB =+Uzl -----END PGP SIGNATURE----- Dan McGee (9): Various documentation updates doc: add website zip to clean files Back out anticipated epoch changes Make debug config messages consistent in capitalization pactest: build the filelist using a set() Fix double read issue in maint releases 3.4.3 release preparation Copy new backend translation over from frontend translation Update 3.4.3 release date Jakob Gruber (3): Tests: Sync group which includes ignored pkgs Move group code to separate function Respect Ignore{Pkg,Group} for group members ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.2-12-ga97e282
by dan＠archlinux.org 22 Jan '11

22 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 a97e28205a462a7433a8d0e7061cd911ea3d8c4c (commit) via 76735e6519c9dd7a3efee2613070588b5a1b12ac (commit) from 85d0111da8413dc7879f6259afc0e5621c2d2634 (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: doc/index.txt | 2 +- lib/libalpm/po/ca.po | 6 +++++- lib/libalpm/po/cs.po | 6 +++++- lib/libalpm/po/de.po | 6 +++++- lib/libalpm/po/el.po | 6 +++++- lib/libalpm/po/en_GB.po | 6 +++++- lib/libalpm/po/es.po | 6 +++++- lib/libalpm/po/fr.po | 6 +++++- lib/libalpm/po/hu.po | 6 +++++- lib/libalpm/po/it.po | 6 +++++- lib/libalpm/po/kk.po | 6 +++++- lib/libalpm/po/libalpm.pot | 6 +++++- lib/libalpm/po/nb.po | 6 +++++- lib/libalpm/po/pl.po | 6 +++++- lib/libalpm/po/pt.po | 6 +++++- lib/libalpm/po/pt_BR.po | 6 +++++- lib/libalpm/po/ro.po | 6 +++++- lib/libalpm/po/ru.po | 6 +++++- lib/libalpm/po/sk.po | 6 +++++- lib/libalpm/po/sv.po | 6 +++++- lib/libalpm/po/tr.po | 6 +++++- lib/libalpm/po/uk.po | 6 +++++- lib/libalpm/po/zh_CN.po | 6 +++++- 23 files changed, 111 insertions(+), 23 deletions(-) mode change 100755 => 100644 lib/libalpm/po/sk.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.2-281-g32727ef
by dan＠archlinux.org 22 Jan '11

22 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 32727efc38bf5376a402c4c4149cc4148ba2068b (commit) via 5699f2c94c39afec19810fc450b78dced86e7c5d (commit) via 2a3b5e40bc92bf3c4f32c27c4030d80f97a5dee1 (commit) via 8f711a7181e16dd8f2ab17946a48d131b58f4cf3 (commit) via ff96649eeb09e4bd8774bc72a8dd1a4fa5a6846b (commit) via d94346ede2b146a3eb9bfc263c049aa2783a032c (commit) via 946f4af7f376c22d33bb24ff997c99231a05c0e7 (commit) via 2c6be06bbab70a2433450290c66cc8b3af24e1d4 (commit) via 505ad87e67b629fd359d3a2ba3ae7f110942447f (commit) via 0de314205f9925c073566de109464b46737b0527 (commit) via 36ea02cc482f14b787f1c7c4999fc347d77be7e5 (commit) via c4332c8091dbba8bb9d9c56a3229843497b58670 (commit) via a97e28205a462a7433a8d0e7061cd911ea3d8c4c (commit) via 76735e6519c9dd7a3efee2613070588b5a1b12ac (commit) via 85d0111da8413dc7879f6259afc0e5621c2d2634 (commit) from 51175f31c4aac9df6ceeffc7855a0f842c580fdb (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 32727efc38bf5376a402c4c4149cc4148ba2068b Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 22:55:31 2010 -0500 pactest: revamp modified logic Remove all logic dealing with PKG_MODIFIED as this rule no longer exists. This removes a bunch of unnecessary stat and checksum logic that most of the time we were never even using. Also update the file modified checks to mark every file created using mkfile() with an older time so any modified checks will just work without hacks. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5699f2c94c39afec19810fc450b78dced86e7c5d Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 22:54:36 2010 -0500 Modify all pactests to not use PKG_MODIFIED All conditions that this particular rule tested are better served by using a more specific rule, whether that be checking a package version or whether files inside the package have changed or still exist. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2a3b5e40bc92bf3c4f32c27c4030d80f97a5dee1 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 22:08:52 2010 -0500 pactest: pylint changes for pmdb Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8f711a7181e16dd8f2ab17946a48d131b58f4cf3 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 21:58:54 2010 -0500 pactest: pylint changes for util Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ff96649eeb09e4bd8774bc72a8dd1a4fa5a6846b Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 21:46:04 2010 -0500 pactest: pylint changes for pmtest Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d94346ede2b146a3eb9bfc263c049aa2783a032c Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 21:35:07 2010 -0500 pactest: pylint changes for pmpkg Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 946f4af7f376c22d33bb24ff997c99231a05c0e7 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 21:30:22 2010 -0500 pactest: pylint changes for pmrule Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2c6be06bbab70a2433450290c66cc8b3af24e1d4 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 21:23:51 2010 -0500 pactest: pylint changes for pmenv Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 505ad87e67b629fd359d3a2ba3ae7f110942447f Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 21:19:56 2010 -0500 pactest: pylint changes for pactest Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0de314205f9925c073566de109464b46737b0527 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 26 21:16:52 2010 -0500 pactest: pylint changes for pmfile Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 36ea02cc482f14b787f1c7c4999fc347d77be7e5 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 27 01:25:45 2010 -0500 Compute download size for sync packages only Neither packages from files nor packages from the local database will ever have a download size. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c4332c8091dbba8bb9d9c56a3229843497b58670 Merge: 51175f3 a97e282 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 10:12:46 2011 -0600 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: NEWS | 3 + configure.ac | 4 +- doc/index.txt | 1 + lib/libalpm/po/ca.po | 6 ++- lib/libalpm/po/cs.po | 6 ++- lib/libalpm/po/de.po | 6 ++- lib/libalpm/po/el.po | 6 ++- lib/libalpm/po/en_GB.po | 6 ++- lib/libalpm/po/es.po | 6 ++- lib/libalpm/po/fr.po | 6 ++- lib/libalpm/po/hu.po | 6 ++- lib/libalpm/po/it.po | 6 ++- lib/libalpm/po/kk.po | 6 ++- lib/libalpm/po/libalpm.pot | 6 ++- lib/libalpm/po/nb.po | 6 ++- lib/libalpm/po/pl.po | 6 ++- lib/libalpm/po/pt.po | 6 ++- lib/libalpm/po/pt_BR.po | 6 ++- lib/libalpm/po/ro.po | 6 ++- lib/libalpm/po/ru.po | 6 ++- lib/libalpm/po/sk.po | 6 ++- lib/libalpm/po/sv.po | 6 ++- lib/libalpm/po/tr.po | 6 ++- lib/libalpm/po/uk.po | 6 ++- lib/libalpm/po/zh_CN.po | 6 ++- lib/libalpm/sync.c | 2 +- test/pacman/README | 1 - test/pacman/pactest.py | 6 +- test/pacman/pmdb.py | 77 +++++++------------------------- test/pacman/pmenv.py | 8 --- test/pacman/pmfile.py | 39 +++++----------- test/pacman/pmpkg.py | 36 +++------------ test/pacman/pmrule.py | 25 +++++------ test/pacman/pmtest.py | 90 +++++++++++++++++++++---------------- test/pacman/tests/scriptlet001.py | 2 +- test/pacman/tests/scriptlet002.py | 2 +- test/pacman/tests/sync101.py | 5 ++- test/pacman/tests/sync102.py | 7 +++- test/pacman/tests/sync103.py | 2 +- test/pacman/tests/sync120.py | 2 +- test/pacman/tests/sync138.py | 2 +- test/pacman/tests/sync898.py | 2 +- test/pacman/tests/upgrade001.py | 1 - test/pacman/tests/upgrade002.py | 1 - test/pacman/tests/upgrade003.py | 1 - test/pacman/util.py | 42 ++++------------- 46 files changed, 242 insertions(+), 251 deletions(-) mode change 100755 => 100644 lib/libalpm/po/sk.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.2-266-g51175f3
by dan＠archlinux.org 22 Jan '11

22 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 51175f31c4aac9df6ceeffc7855a0f842c580fdb (commit) via e277e838d798c1463ae5df98dcf637df70e048ec (commit) via b947db040c2c586636fc290f0fadbe89e9802450 (commit) via 859bdb5b1d1b9ccb781c95026836283a005a96ce (commit) via 01403f423a9bace8b43d45a0dfcea5d4f1002cc8 (commit) via b8ab96a270caa5d589c44c62d5664db156d94af7 (commit) via bf46e04614b3740eea4a5e0d44767f57e1cffa4d (commit) via 5c46ba14f780474e2b04b54aa7b0c8bf60de2b5b (commit) via e068b58507ad58e2037aeb323a74d27377a0feac (commit) via 50f446886b8b09b9bcdb30494d7a0c4d93a8a37a (commit) from 3863e48788e2424c4f1469e72dabda6fba595c4c (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 51175f31c4aac9df6ceeffc7855a0f842c580fdb Merge: e277e83 859bdb5 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 10:03:51 2011 -0600 Merge branch 'epoch-work' commit e277e838d798c1463ae5df98dcf637df70e048ec Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sat Jan 22 15:15:16 2011 +0100 Makefile: Use git describe --dirty for GIT VERSION dirty indicates if the repo has uncommited changes or not when building, so dont hardcode this info. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b947db040c2c586636fc290f0fadbe89e9802450 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jan 23 00:13:24 2011 +1000 repo-add: only attempt to create deltas when asked repo-add should only attempt to create the delta file when using the -d option. Also adjust a couple of tests to use the "double bracket" syntax. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 859bdb5b1d1b9ccb781c95026836283a005a96ce Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 20 18:29:41 2011 -0600 doc: update current list of authors Allan, I had no idea you were not listed here. I think you count as an active developer at the moment. Also, move Aaron to the past contributors section. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 01403f423a9bace8b43d45a0dfcea5d4f1002cc8 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 7 20:59:51 2011 -0600 doc: add a vercmp manpage This includes info on version comparison that is very similar to the stuff in the pacman manpage, but also a few vercmp examples, the return values, and other fun stuff. Also update the version comparison stuff in the pacman manpage. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b8ab96a270caa5d589c44c62d5664db156d94af7 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 20 18:16:06 2011 -0600 makepkg: encode epoch in version specifier if > 0 This makes things consistent with everywhere else we are incorporating the new optional epoch field. Add a helper function that forms the version string for you and use it in makepkg where I found 'pkgver.*-.*pkgrel'. This exposes a few shortcomings in a previous "Override pkgver" patch (2020e629) in the install package and check if built functions. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bf46e04614b3740eea4a5e0d44767f57e1cffa4d Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 10 13:40:31 2011 -0600 Remove epoch as an independent field Instead, go the same route we have always taken with version-release in libalpm and treat it all as one piece of information. Makepkg is the only script that knows about epoch as a distinct value; from there on out we will parse out the components as necessary. This makes the code a lot simpler as far as epoch handling goes. The downside here is that we are tossing some compatibility to the wind; packages using force will have to be rebuilt with an incremented epoch to keep their special status. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5c46ba14f780474e2b04b54aa7b0c8bf60de2b5b Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 10 10:44:25 2011 -0600 Allow version comparison to contain epoch specifier Adapting from RPM, follow the [epoch:]version[-release] syntax. We can also borrow some of their parsing code for our purposes (thanks!). Add some new tests to our vercmp shell script tester for epoch comparisons, and then make the code work with these newfangled epoch specifiers. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e068b58507ad58e2037aeb323a74d27377a0feac Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 3 18:35:27 2011 -0600 pactest: add more testing for epoch Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 50f446886b8b09b9bcdb30494d7a0c4d93a8a37a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 3 17:28:20 2011 -0600 pactest: Rename epoch pactests Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bacman.in | 6 - doc/.gitignore | 1 + doc/Makefile.am | 6 +- doc/PKGBUILD.5.txt | 2 +- doc/footer.txt | 3 +- doc/index.txt | 1 + doc/pacman.8.txt | 6 +- doc/vercmp.8.txt | 71 +++++++++++ lib/libalpm/alpm.h | 1 - lib/libalpm/be_local.c | 16 --- lib/libalpm/be_package.c | 7 - lib/libalpm/be_sync.c | 9 -- lib/libalpm/package.c | 20 --- lib/libalpm/package.h | 2 - lib/libalpm/version.c | 157 ++++++++++++++++++------- scripts/Makefile.am | 2 +- scripts/makepkg.sh.in | 67 +++++++---- scripts/repo-add.sh.in | 28 ++--- src/pacman/Makefile.am | 2 +- src/util/vercmp.c | 4 +- test/pacman/pmdb.py | 14 --- test/pacman/pmpkg.py | 6 - test/pacman/pmrule.py | 3 - test/pacman/tests/{sync140.py => epoch001.py} | 5 +- test/pacman/tests/{sync141.py => epoch002.py} | 3 +- test/pacman/tests/{sync142.py => epoch003.py} | 8 +- test/pacman/tests/{sync143.py => epoch004.py} | 8 +- test/pacman/tests/epoch010.py | 12 ++ test/pacman/tests/epoch011.py | 12 ++ test/pacman/tests/epoch012.py | 13 ++ test/pacman/tests/sync136.py | 5 +- test/pacman/tests/sync137.py | 3 +- test/util/vercmptest.sh | 19 +++ 33 files changed, 332 insertions(+), 190 deletions(-) create mode 100644 doc/vercmp.8.txt rename test/pacman/tests/{sync140.py => epoch001.py} (72%) rename test/pacman/tests/{sync141.py => epoch002.py} (86%) rename test/pacman/tests/{sync142.py => epoch003.py} (60%) rename test/pacman/tests/{sync143.py => epoch004.py} (71%) create mode 100644 test/pacman/tests/epoch010.py create mode 100644 test/pacman/tests/epoch011.py create mode 100644 test/pacman/tests/epoch012.py hooks/post-receive -- The official pacman repository

1 0