November 2007 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Fix alpm_list_add_sorted
by Nagy Gabor 19 Nov '07

19 Nov '07

Hi! Patch attached. Well, I dislike hacking the fundamental alpm_list.c, so I ask you to _doublecheck_ the patch before committing. Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

3 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.0-595-ge289731
by Dan McGee 17 Nov '07

17 Nov '07

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 e28973169d2e5eda8b64ebdda11ece0dc761d978 (commit) via c8be7540a50583194e971918099006a1736cfab7 (commit) via d311ad067f47608252b9276df90087db98b1100f (commit) via 04b7d2ad140058a7cab911fb77ec0285bf76b059 (commit) via 3d10786394f5b2a65104fdff3d31d70022dfd68d (commit) via cfcc550e2ac55616c81d2347c2467aec9d56d25e (commit) via 2322909703eb2f30ac0ef7273420f13c5f61410b (commit) via 3cd684b41dd606d42da76fcc3911be446dd3b78b (commit) via 6f2b43624915e3e1928cad2bbe14fd8b1ab21e12 (commit) via 4ce13e2398a8ec3f960fbf544a17507ffc17eca1 (commit) from 2f55733be35e7ec4188ddab17a92ed67faa7210d (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 e28973169d2e5eda8b64ebdda11ece0dc761d978 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Nov 17 14:05:48 2007 +0100 pacman/sync.c : remove duplicated fallback on providers. The fallback on providers when a target is not found was already made in the backend : libalpm/sync.c , _alpm_sync_addtarget . So I removed it from the frontend. The sync500 pactest proves this fallback still works correctly. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c8be7540a50583194e971918099006a1736cfab7 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Nov 17 13:06:44 2007 +0100 Remove provide.c and provide.h . This file only contained one private function : _alpm_db_whatprovides . And the public alpm_db_whatprovides was in db.c , so I moved everything there. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> [Dan: updated POTFILES.in as well] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d311ad067f47608252b9276df90087db98b1100f Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri Nov 16 20:50:58 2007 +0100 Generalized alpm_list_find. The old alpm_list_find was renamed to alpm_list_find_ptr, and a new alpm_list_find was introduced, which uses the fn comparison-function parameter in its decision. Now both alpm_list_find_ptr (a new ptrcmp helper function was also added) and alpm_list_find_str are just an alpm_list_find call. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> [Dan: made ptrcmp a static function] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 04b7d2ad140058a7cab911fb77ec0285bf76b059 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri Nov 16 22:48:29 2007 +0100 Two memleak fixes in pacman. Both memleak was an unfreed alpm_db_whatprovides list. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> commit 3d10786394f5b2a65104fdff3d31d70022dfd68d Author: Dan McGee <dan(a)archlinux.org> Date: Sat Nov 17 09:39:00 2007 -0600 Fix memleak in _alpm_trans_free with package lists Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cfcc550e2ac55616c81d2347c2467aec9d56d25e Author: Dan McGee <dan(a)archlinux.org> Date: Fri Nov 16 21:15:49 2007 -0600 libalpm: use FREELIST when possible Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2322909703eb2f30ac0ef7273420f13c5f61410b Author: Dan McGee <dan(a)archlinux.org> Date: Fri Nov 16 20:18:45 2007 -0600 War on whitespace Run the kernel's cleanfile script on all of our source files. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3cd684b41dd606d42da76fcc3911be446dd3b78b Author: Dan McGee <dan(a)archlinux.org> Date: Fri Nov 16 11:51:26 2007 -0600 libalpm: simplify sync db lastupdate Legacy code is hitting the trash here. Remove unnecessary _alpm_time2string time storage abstraction in favor of just writing the time_t value to the disk. The only drawback is that everyone's sync DBs will have to be updated at least once so that the lastupdate values are stored right. :) Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6f2b43624915e3e1928cad2bbe14fd8b1ab21e12 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Nov 15 08:07:45 2007 -0600 Add new mirror (FS#8638) Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4ce13e2398a8ec3f960fbf544a17507ffc17eca1 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Nov 15 08:05:10 2007 -0600 Fix a would-be memleak with the new compute requiredby stuff Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: etc/pacman.d/mirrorlist.in | 1 + lib/libalpm/Makefile.am | 1 - lib/libalpm/add.c | 14 ++++------ lib/libalpm/add.h | 6 ++-- lib/libalpm/alpm.c | 6 ++-- lib/libalpm/alpm.h | 8 +++--- lib/libalpm/alpm_list.c | 59 ++++++++++++++++++++++++++----------------- lib/libalpm/alpm_list.h | 11 ++++--- lib/libalpm/backup.c | 8 +++--- lib/libalpm/backup.h | 6 ++-- lib/libalpm/be_files.c | 52 +++++++++++++++++-------------------- lib/libalpm/cache.c | 6 ++-- lib/libalpm/cache.h | 6 ++-- lib/libalpm/conflict.c | 12 +++----- lib/libalpm/conflict.h | 6 ++-- lib/libalpm/db.c | 55 +++++++++++++++++++++++++++++----------- lib/libalpm/db.h | 14 ++++++--- lib/libalpm/delta.c | 6 ++-- lib/libalpm/delta.h | 6 ++-- lib/libalpm/deps.c | 25 +++++++++--------- lib/libalpm/deps.h | 6 ++-- lib/libalpm/error.c | 6 ++-- lib/libalpm/error.h | 6 ++-- lib/libalpm/group.h | 6 ++-- lib/libalpm/handle.c | 6 ++-- lib/libalpm/handle.h | 10 +++--- lib/libalpm/log.c | 6 ++-- lib/libalpm/log.h | 6 ++-- lib/libalpm/md5.c | 1 - lib/libalpm/package.c | 14 ++++------ lib/libalpm/package.h | 6 ++-- lib/libalpm/po/POTFILES.in | 4 +- lib/libalpm/provide.c | 58 ------------------------------------------ lib/libalpm/provide.h | 32 ----------------------- lib/libalpm/remove.c | 15 +++++------ lib/libalpm/remove.h | 6 ++-- lib/libalpm/server.c | 60 ++++++++++++++++++++----------------------- lib/libalpm/server.h | 10 +++--- lib/libalpm/sync.c | 11 +++---- lib/libalpm/sync.h | 6 ++-- lib/libalpm/trans.c | 18 +++++-------- lib/libalpm/trans.h | 6 ++-- lib/libalpm/util.c | 22 +++------------- lib/libalpm/util.h | 7 ++--- src/pacman/add.c | 8 +++--- src/pacman/callback.c | 10 +++--- src/pacman/conf.c | 6 ++-- src/pacman/conf.h | 6 ++-- src/pacman/deptest.c | 9 +++--- src/pacman/package.c | 14 +++++----- src/pacman/package.h | 6 ++-- src/pacman/remove.c | 8 +++--- src/pacman/sync.c | 22 ++-------------- src/pacman/util.c | 14 +++++----- src/util/testdb.c | 6 ++-- src/util/testpkg.c | 6 ++-- src/util/vercmp.c | 8 +++--- 57 files changed, 330 insertions(+), 429 deletions(-) delete mode 100644 lib/libalpm/provide.c delete mode 100644 lib/libalpm/provide.h hooks/post-receive -- The official pacman repository

1 1

[pacman-dev] [PATCH 5/5] pacman/sync.c : remove duplicated fallback on providers.
by Chantry Xavier 17 Nov '07

17 Nov '07

The fallback on providers when a target is not found was already made in the backend : libalpm/sync.c , _alpm_sync_addtarget . So I removed it from the frontend. The sync500 pactest proves this fallback still works correctly. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- src/pacman/sync.c | 23 +++-------------------- 1 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 6f3c5d5..bb48cf9 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -524,26 +524,9 @@ int sync_trans(alpm_list_t *targets, int sync_only) } } if(!found) { - /* targ not found in sync db, searching for providers... */ - const char *pname = NULL; - for(j = sync_dbs; j; j = alpm_list_next(j)) { - pmdb_t *db = alpm_list_getdata(j); - alpm_list_t *prov = alpm_db_whatprovides(db, targ); - if(prov) { - pmpkg_t *pkg = alpm_list_getdata(prov); - pname = alpm_pkg_get_name(pkg); - alpm_list_free(prov); - break; - } - } - if(pname != NULL) { - /* targ is provided by pname */ - targets = alpm_list_add(targets, strdup(pname)); - } else { - fprintf(stderr, _("error: '%s': not found in sync db\n"), targ); - retval = 1; - goto cleanup; - } + fprintf(stderr, _("error: '%s': not found in sync db\n"), targ); + retval = 1; + goto cleanup; } } } -- 1.5.3.5

4 4

[pacman-dev] [PATCH 3/5] Remove provide.c and provide.h .
by Chantry Xavier 17 Nov '07

17 Nov '07

This file only contained one private function : _alpm_db_whatprovides . And the public alpm_db_whatprovides was in db.c , so I moved everything there. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/Makefile.am | 1 - lib/libalpm/add.c | 1 - lib/libalpm/db.c | 25 +++++++++++++++++++- lib/libalpm/db.h | 3 ++ lib/libalpm/deps.c | 1 - lib/libalpm/package.c | 1 - lib/libalpm/provide.c | 58 ----------------------------------------------- lib/libalpm/provide.h | 32 -------------------------- lib/libalpm/remove.c | 1 - lib/libalpm/sync.c | 1 - lib/libalpm/trans.c | 1 - 11 files changed, 27 insertions(+), 98 deletions(-) delete mode 100644 lib/libalpm/provide.c delete mode 100644 lib/libalpm/provide.h diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index b84dcc3..6549066 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -33,7 +33,6 @@ libalpm_la_SOURCES = \ log.h log.c \ md5.h md5.c \ package.h package.c \ - provide.h provide.c \ remove.h remove.c \ server.h server.c \ sync.h sync.c \ diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 1da874a..8538d22 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -45,7 +45,6 @@ #include "backup.h" #include "package.h" #include "db.h" -#include "provide.h" #include "conflict.h" #include "deps.h" #include "remove.h" diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 80c1c12..af58387 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -41,7 +41,6 @@ #include "util.h" #include "error.h" #include "server.h" -#include "provide.h" #include "handle.h" #include "cache.h" #include "alpm.h" @@ -778,4 +777,28 @@ pmdb_t *_alpm_db_register_sync(const char *treename) return(db); } +/* return a alpm_list_t of packages in "db" that provide "package" + */ +alpm_list_t *_alpm_db_whatprovides(pmdb_t *db, const char *package) +{ + alpm_list_t *pkgs = NULL; + alpm_list_t *lp; + + ALPM_LOG_FUNC; + + if(db == NULL || package == NULL || strlen(package) == 0) { + return(NULL); + } + + for(lp = _alpm_db_get_pkgcache(db); lp; lp = lp->next) { + pmpkg_t *info = lp->data; + + if(alpm_list_find_str(alpm_pkg_get_provides(info), package)) { + pkgs = alpm_list_add(pkgs, info); + } + } + + return(pkgs); +} + /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 16e1298..5d7173b 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -56,6 +56,9 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles); pmdb_t *_alpm_db_register_local(void); pmdb_t *_alpm_db_register_sync(const char *treename); +/* Provision */ +alpm_list_t *_alpm_db_whatprovides(pmdb_t *db, const char *package); + /* be.c, backend specific calls */ int _alpm_db_install(pmdb_t *db, const char *dbfile); int _alpm_db_open(pmdb_t *db); diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 548b643..679981c 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -36,7 +36,6 @@ #include "package.h" #include "db.h" #include "cache.h" -#include "provide.h" #include "handle.h" static pmgraph_t *_alpm_graph_new(void) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index d992766..b6691a2 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -47,7 +47,6 @@ #include "db.h" #include "cache.h" #include "delta.h" -#include "provide.h" #include "handle.h" #include "deps.h" diff --git a/lib/libalpm/provide.c b/lib/libalpm/provide.c deleted file mode 100644 index df600be..0000000 --- a/lib/libalpm/provide.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * provide.c - * - * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - */ - -#include "config.h" - -#include <stdlib.h> -#include <string.h> - -/* libalpm */ -#include "provide.h" -#include "alpm_list.h" -#include "cache.h" -#include "db.h" -#include "log.h" - -/* return a alpm_list_t of packages in "db" that provide "package" - */ -alpm_list_t *_alpm_db_whatprovides(pmdb_t *db, const char *package) -{ - alpm_list_t *pkgs = NULL; - alpm_list_t *lp; - - ALPM_LOG_FUNC; - - if(db == NULL || package == NULL || strlen(package) == 0) { - return(NULL); - } - - for(lp = _alpm_db_get_pkgcache(db); lp; lp = lp->next) { - pmpkg_t *info = lp->data; - - if(alpm_list_find_str(alpm_pkg_get_provides(info), package)) { - pkgs = alpm_list_add(pkgs, info); - } - } - - return(pkgs); -} - -/* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/provide.h b/lib/libalpm/provide.h deleted file mode 100644 index b5c55db..0000000 --- a/lib/libalpm/provide.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * provide.h - * - * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - */ -#ifndef _ALPM_PROVIDE_H -#define _ALPM_PROVIDE_H - -#include "db.h" -#include "alpm_list.h" -#include "config.h" - -alpm_list_t *_alpm_db_whatprovides(pmdb_t *db, const char *package); - -#endif /* _ALPM_PROVIDE_H */ - -/* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 66a1527..5143505 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -46,7 +46,6 @@ #include "db.h" #include "cache.h" #include "deps.h" -#include "provide.h" #include "handle.h" #include "alpm.h" diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index e5748e6..6024b6b 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -42,7 +42,6 @@ #include "cache.h" #include "deps.h" #include "conflict.h" -#include "provide.h" #include "trans.h" #include "util.h" #include "handle.h" diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index bcd0707..f537e69 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -48,7 +48,6 @@ #include "alpm.h" #include "deps.h" #include "cache.h" -#include "provide.h" /** \addtogroup alpm_trans Transaction Functions * @brief Functions to manipulate libalpm transactions -- 1.5.3.5

1 0

[pacman-dev] [PATCH 2/5] Generalized alpm_list_find.
by Nagy Gabor 17 Nov '07

17 Nov '07

The old alpm_list_find was renamed to alpm_list_find_ptr, and a new alpm_list_find was introduced, which uses the fn comparison-function parameter in its decision. Now both alpm_list_find_ptr (a new ptrcmp helper function was also added) and alpm_list_find_str are just an alpm_list_find call. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/add.c | 2 +- lib/libalpm/alpm_list.c | 43 ++++++++++++++++++++++++++++--------------- lib/libalpm/alpm_list.h | 5 +++-- lib/libalpm/db.c | 2 +- lib/libalpm/delta.c | 2 +- 5 files changed, 34 insertions(+), 20 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index d242134..1da874a 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -282,7 +282,7 @@ static int upgrade_remove(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *trans, pm for(b = alpm_pkg_get_backup(newpkg); b; b = b->next) { const char *backup = b->data; /* make sure we don't add duplicate entries */ - if(!alpm_list_find(handle->noupgrade, backup)) { + if(!alpm_list_find_ptr(handle->noupgrade, backup)) { _alpm_log(PM_LOG_DEBUG, "adding %s to the NoUpgrade array temporarily\n", backup); handle->noupgrade = alpm_list_add(handle->noupgrade, strdup(backup)); diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index c1e4cb8..08344d6 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -353,7 +353,7 @@ alpm_list_t SYMEXPORT *alpm_list_remove_dupes(const alpm_list_t *list) const alpm_list_t *lp = list; alpm_list_t *newlist = NULL; while(lp) { - if(!alpm_list_find(newlist, lp->data)) { + if(!alpm_list_find_ptr(newlist, lp->data)) { newlist = alpm_list_add(newlist, lp->data); } lp = lp->next; @@ -542,19 +542,19 @@ int SYMEXPORT alpm_list_count(const alpm_list_t *list) /** * @brief Find an item in a list. - * - * Search for the item whos data matches that of the `needle`. * - * @param needle the data to search for (== comparison) + * @param needle the item to search * @param haystack the list + * @param fn the comparison function for searching (!= NULL) * * @return 1 if `needle` is found, 0 otherwise */ -int SYMEXPORT alpm_list_find(const alpm_list_t *haystack, const void *needle) +int SYMEXPORT alpm_list_find(const alpm_list_t *haystack, const void *needle, + alpm_list_fn_cmp fn) { const alpm_list_t *lp = haystack; while(lp) { - if(lp->data == needle) { + if(lp->data && fn(lp->data, needle) == 0) { return(1); } lp = lp->next; @@ -562,9 +562,29 @@ int SYMEXPORT alpm_list_find(const alpm_list_t *haystack, const void *needle) return(0); } +/* trivial helper function for alpm_list_find_ptr */ +int ptrcmp(const void *p, const void *q) +{ + return(p != q); +} + +/** + * @brief Find an item in a list. + * + * Search for the item whos data matches that of the `needle`. + * + * @param needle the data to search for (== comparison) + * @param haystack the list + * + * @return 1 if `needle` is found, 0 otherwise + */ +int SYMEXPORT alpm_list_find_ptr(const alpm_list_t *haystack, const void *needle) +{ + return(alpm_list_find(haystack, needle, ptrcmp)); +} + /** * @brief Find a string in a list. - * Optimization of alpm_list_find for strings. * * @param needle the string to search for * @param haystack the list @@ -573,14 +593,7 @@ int SYMEXPORT alpm_list_find(const alpm_list_t *haystack, const void *needle) */ int SYMEXPORT alpm_list_find_str(const alpm_list_t *haystack, const char *needle) { - const alpm_list_t *lp = haystack; - while(lp) { - if(lp->data && strcmp((const char *)lp->data, needle) == 0) { - return(1); - } - lp = lp->next; - } - return(0); + return(alpm_list_find(haystack, (const void*)needle, (alpm_list_fn_cmp)strcmp)); } /** diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index b364670..b3bfa70 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -72,8 +72,9 @@ void *alpm_list_getdata(const alpm_list_t *entry); /* misc */ int alpm_list_count(const alpm_list_t *list); -int alpm_list_find(const alpm_list_t *haystack, const void *needle); -int alpm_list_find_str(const alpm_list_t *haystack,const char *needle); +int alpm_list_find(const alpm_list_t *haystack, const void *needle, alpm_list_fn_cmp fn); +int alpm_list_find_ptr(const alpm_list_t *haystack, const void *needle); +int alpm_list_find_str(const alpm_list_t *haystack, const char *needle); alpm_list_t *alpm_list_diff(const alpm_list_t *lhs, const alpm_list_t *rhs, alpm_list_fn_cmp fn); #ifdef __cplusplus diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 150b365..80c1c12 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -239,7 +239,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) ASSERT(handle->trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1)); ASSERT(handle->trans->type == PM_TRANS_TYPE_SYNC, RET_ERR(PM_ERR_TRANS_TYPE, -1)); - if(!alpm_list_find(handle->dbs_sync, db)) { + if(!alpm_list_find_ptr(handle->dbs_sync, db)) { RET_ERR(PM_ERR_DB_NOT_FOUND, -1); } diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 0e9dcc3..3d1c7d7 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -170,7 +170,7 @@ static alpm_list_t *shortest_delta_path(alpm_list_t *deltas, /* If this vertex has already been visited in the path, go to the * next vertex. */ - if(alpm_list_find(path, v)) + if(alpm_list_find_ptr(path, v)) continue; /* Once we find a vertex that starts at the 'from' version, -- 1.5.3.5

1 0

[pacman-dev] [PATCH] generalize alpm_list_find_str
by Nagy Gabor 17 Nov '07

17 Nov '07

Hi! Patch attached. Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

3 4

[pacman-dev] database on separate fs and inodes
by Łukasz Wychrystenko 16 Nov '07

16 Nov '07

Hi Long story short: (before signing new bug i want to be sure) After putting /var/lib/pacman on separate fs (raid1) i just messed things a little and run out of inodes. # fsck.ext2 -pfv /dev/md1 18072 inodes used (100.00%) Most important is what pacman did. So after -Syu packages were updated and no changes in db was made. Most important is that i pacman didn't show any error msg about that. Today i trayed -Syu again i got last time installed packages list added to new one. Pacman showed only packages list and size then just quit w/o any error again. Now I'm trying to repair db and reproduce bug, but i think that quick fix for that is to make small change in pacman that first he will tray to write db entry then packages files to disk. Sorry for my 'bad' English i hope that all catch my drift.

3 4

[pacman-dev] [PATCH] Two memleak fixes in pacman
by Nagy Gabor 16 Nov '07

16 Nov '07

Patch attached Bye ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

2 3

[pacman-dev] IgnorePkg handling
by Xavier 16 Nov '07

16 Nov '07

I just found another thing I overlooked in a patch I submitted a while ago : "Let IgnorePkg superceed the FORCE package flag" , commit 5de03497c3f. I didn't see a change Dan made one month before : "* --ignore was being ignored (haha) on sysupgrade when a package was listed as being a force upgrade. This adds a prompt to the user in this case asking what to do." , commit 4a0aac3862 . So the change I made in alpm_pkg_compare_versions made this fix from Dan in _alpm_sync_sysupgrade obsolete. This code can't be run anymore. So I don't know, maybe this commit could be reverted now?

3 5

[pacman-dev] Segmentation fault
by Nagy Gabor 15 Nov '07

15 Nov '07

Hi! Finally I could reproduce FS#8350. Some background: -this is probably not important, but my "union" sync repo is sitting on my pendrive [in the suggestive file:///p/1 path ;-], so my syncdb is always out of sync [pendrive's size-limitation] -tk is in my sync repo [/p/1], cdparanoia is not [neither of the packages is installed, both can be found in my syncdb] S_good.txt: # pacman -S cdparanoia tk --debug S_fail.txt # pacman -S cdparanoia tk --debug Hm. What's the difference?: In the first case tk is in my /var/cache, so pacman tries to download only cdparanoia. In the second case my cache is empty (after -Scc), so pacman tries to download both (however, pacman could download tk to my cache before segfault) Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

3 7