- Pacman-dev - lists.archlinux.org

[pacman-dev] -Sp is broken?
by Nagy Gabor 19 Nov '07

19 Nov '07

-Sp simply seems to be broken. If I do pacman -Sp evince, I get the following error: 'error: evince': transaction not initialized error: failed to release transaction (transaction not initialized) Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

5 12

[pacman-dev] [PATCH 4/5] Versioned provisions
by Nagy Gabor 19 Nov '07

19 Nov '07

This patch introduces versioned provisions in "provision 1.0-1" format. _alpm_db_whatprovides was modified accordingly (added sync500.py) alpm_depcmp was modified accordingly (add043.py passes now; added add044.py and add045.py) Note: alpm_db_search now uses the whole versioned %PROVIDES% string in its search Note: debug logging was simplified in alpm_depcmp Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> [Xavier: fixed a few typos, duplicate const strings with strdup before modifying them, put some debugging back in alpm_depcmp, minor code cleanups (var/function renaming), added a note in PKGBUILD man page.] Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- doc/PKGBUILD.5.txt | 2 + lib/libalpm/db.c | 21 +++++++++++++++++- lib/libalpm/db.h | 1 + lib/libalpm/deps.c | 54 +++++++++++++++++++++++++-------------------- lib/libalpm/sync.c | 4 +- pactest/tests/add044.py | 15 ++++++++++++ pactest/tests/add045.py | 15 ++++++++++++ pactest/tests/sync500.py | 10 ++++++++ 8 files changed, 95 insertions(+), 27 deletions(-) create mode 100644 pactest/tests/add044.py create mode 100644 pactest/tests/add045.py create mode 100644 pactest/tests/sync500.py diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 6950041..0d3ff3a 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -133,6 +133,8 @@ Options and Directives a package to provide dependencies other than its own package name. For example, the dcron package can provide 'cron', which allows packages to depend on 'cron' rather than 'dcron OR fcron'. + Versioned provisions are also possible. For example, dcron can provide + 'cron 2.0' to satisfy the 'cron>=2.0' dependency of other packages. *replaces (array)*:: An array of packages that this package should replace, and can be used diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index af58387..fd5786e 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -777,6 +777,25 @@ pmdb_t *_alpm_db_register_sync(const char *treename) return(db); } +/* helper function for alpm_list_find and _alpm_db_whatprovides + * + * @return "provision.name" == needle (as string) + */ +int _alpm_prov_cmp(const void *provision, const void *needle) +{ + char *tmpptr; + char *provname = strdup(provision); + int retval = 0; + tmpptr = strchr(provname, ' '); + + if(tmpptr != NULL) { /* provision-version */ + *tmpptr='\0'; + } + retval = strcmp(provname, needle); + free(provname); + return(retval); +} + /* return a alpm_list_t of packages in "db" that provide "package" */ alpm_list_t *_alpm_db_whatprovides(pmdb_t *db, const char *package) @@ -793,7 +812,7 @@ alpm_list_t *_alpm_db_whatprovides(pmdb_t *db, const char *package) 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)) { + if(alpm_list_find(alpm_pkg_get_provides(info), (const void *)package, _alpm_prov_cmp)) { pkgs = alpm_list_add(pkgs, info); } } diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 5d7173b..c34dfeb 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -57,6 +57,7 @@ pmdb_t *_alpm_db_register_local(void); pmdb_t *_alpm_db_register_sync(const char *treename); /* Provision */ +int _alpm_prov_cmp(const void *provision, const void *needle); alpm_list_t *_alpm_db_whatprovides(pmdb_t *db, const char *package); /* be.c, backend specific calls */ diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 679981c..9232984 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -373,10 +373,12 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, /* else if still not found... */ if(!found) { + char *depstring = alpm_dep_get_string(depend); _alpm_log(PM_LOG_DEBUG, "missing dependency '%s' for package '%s'\n", - (char*)j->data, alpm_pkg_get_name(tp)); + depstring, alpm_pkg_get_name(tp)); + free(depstring); miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), PM_DEP_TYPE_DEPEND, depend->mod, - depend->name, depend->version); + depend->name, depend->version); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); } else { @@ -419,8 +421,10 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, for(l = _alpm_db_get_pkgcache(db); l; l = l->next) { pmpkg_t *pkg = l->data; if(alpm_depcmp(pkg, depend) && !_alpm_pkg_find(alpm_pkg_get_name(pkg), packages)) { + char *depstring = alpm_dep_get_string(depend); _alpm_log(PM_LOG_DEBUG, "checkdeps: dependency '%s' satisfied by installed package '%s'\n", - (char*)k->data, alpm_pkg_get_name(pkg)); + depstring, alpm_pkg_get_name(pkg)); + free(depstring); satisfied = 1; break; } @@ -469,38 +473,40 @@ static int dep_vercmp(const char *version1, pmdepmod_t mod, int SYMEXPORT alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep) { - int equal = 0; + alpm_list_t *i; ALPM_LOG_FUNC; const char *pkgname = alpm_pkg_get_name(pkg); - const char *pkgversion = alpm_pkg_get_version(pkg); + const char *pkgver = alpm_pkg_get_version(pkg); + int satisfy = 0; - if(strcmp(pkgname, dep->name) == 0 - || alpm_list_find_str(alpm_pkg_get_provides(pkg), dep->name)) { + /* check (pkg->name, pkg->version) */ + satisfy = (!strcmp(pkgname, dep->name) + && dep_vercmp(pkgver, dep->mod, dep->version)); - equal = dep_vercmp(pkgversion, dep->mod, dep->version); + /* check provisions, format : "name version" */ + for(i = alpm_pkg_get_provides(pkg); i && !satisfy; i = i->next) { + char *provname = strdup(i->data); + char *provver = strchr(provname, ' '); - char *mod = "~="; - switch(dep->mod) { - case PM_DEP_MOD_EQ: mod = "=="; break; - case PM_DEP_MOD_GE: mod = ">="; break; - case PM_DEP_MOD_LE: mod = "<="; break; - default: break; - } - - if(strlen(dep->version) > 0) { - _alpm_log(PM_LOG_DEBUG, "depcmp: %s-%s %s %s-%s => %s\n", - pkgname, pkgversion, - mod, dep->name, dep->version, (equal ? "match" : "no match")); + if(provver == NULL) { /* no provision version */ + satisfy = (dep->mod == PM_DEP_MOD_ANY + && !strcmp(provname, dep->name)); } else { - _alpm_log(PM_LOG_DEBUG, "depcmp: %s-%s %s %s => %s\n", - pkgname, pkgversion, - mod, dep->name, (equal ? "match" : "no match")); + *provver = '\0'; + provver += 1; + satisfy = (!strcmp(provname, dep->name) + && dep_vercmp(provver, dep->mod, dep->version)); } + free(provname); } - return(equal); + char *depstring = alpm_dep_get_string(dep); + _alpm_log(PM_LOG_DEBUG, "alpm_depcmp %s-%s %s : %smatch\n", + pkgname, pkgver, depstring, satisfy ? "" : "no "); + free(depstring); + return(satisfy); } pmdepend_t SYMEXPORT *alpm_splitdep(const char *depstring) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 6024b6b..1fd8700 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -499,8 +499,8 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync } pmpkg_t *local = _alpm_db_get_pkgfromcache(db_local, miss->depend.name); /* check if this package provides the package it's conflicting with */ - if(alpm_list_find_str(alpm_pkg_get_provides(sync->pkg), - miss->depend.name)) { + if(alpm_list_find(alpm_pkg_get_provides(sync->pkg), + miss->depend.name, _alpm_prov_cmp)) { /* treat like a replaces item so requiredby fields are * inherited properly. */ _alpm_log(PM_LOG_DEBUG, "package '%s' provides its own conflict\n", diff --git a/pactest/tests/add044.py b/pactest/tests/add044.py new file mode 100644 index 0000000..cbc82e9 --- /dev/null +++ b/pactest/tests/add044.py @@ -0,0 +1,15 @@ +self.description = "provision>=1.0-2 dependency (2)" + +p = pmpkg("pkg1", "1.0-2") +p.depends = ["provision>=1.0-2"] +self.addpkg(p) + +lp = pmpkg("pkg2", "1.0-2") +lp.provides = ["provision 1.0-2"] +self.addpkg2db("local", lp) + +self.args = "-A %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") diff --git a/pactest/tests/add045.py b/pactest/tests/add045.py new file mode 100644 index 0000000..b53e090 --- /dev/null +++ b/pactest/tests/add045.py @@ -0,0 +1,15 @@ +self.description = "provision>=1.0-2 dependency (3)" + +p = pmpkg("pkg1", "1.0-2") +p.depends = ["provision>=1.0-2"] +self.addpkg(p) + +lp = pmpkg("pkg2", "1.0-2") +lp.provides = ["provision 1.0-1"] +self.addpkg2db("local", lp) + +self.args = "-A %s" % p.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") diff --git a/pactest/tests/sync500.py b/pactest/tests/sync500.py new file mode 100644 index 0000000..36364c1 --- /dev/null +++ b/pactest/tests/sync500.py @@ -0,0 +1,10 @@ +self.description = "-S provision" + +sp = pmpkg("pkg1") +sp.provides = ["provision 1.0-1"] +self.addpkg2db("sync", sp) + +self.args = "-S provision" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") -- 1.5.3.5

4 7

[pacman-dev] [PATCH]: makeworld: gettext support
by Giovanni Scafora 19 Nov '07

19 Nov '07

Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> --- scripts/makeworld.sh.in | 53 +++++++++++++++++++++++++--------------------- 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/scripts/makeworld.sh.in b/scripts/makeworld.sh.in index 728e00e..49b758c 100644 --- a/scripts/makeworld.sh.in +++ b/scripts/makeworld.sh.in @@ -21,45 +21,50 @@ # USA. # +# gettext initialization +export TEXTDOMAIN='pacman' +export TEXTDOMAINDIR='@localedir@' + myver="@PACKAGE_VERSION@" +BUG_REPORT_EMAIL='@PACKAGE_BUGREPORT@' toplevel=$(pwd) usage() { printf "makeworld (pacman) %s\n" "$myver" - echo "usage: $0 [options] <destdir> <category> [category] ..." - echo "options:" - echo " -b, --builddeps Build missing dependencies from source" - echo " -B, --noccache Do not use ccache during build" - echo " -c, --clean Clean up work files after build" - echo " -C, --cleancache Clean up source files from the cache" - echo " -d, --nodeps Skip all dependency checks" - echo " -e, --noextract Do not extract source files (use existing src/ dir)" - echo " -f, --force Overwrite existing packages" - echo " -i, --install Install package after successful build" - echo " -m, --nocolor Disable colorized output messages" - echo " -h, --help This help" - echo " -o, --nobuild Download and extract files only" - echo " -r, --rmdeps Remove installed dependencies after a successful build" - echo " -s, --syncdeps Install missing dependencies with pacman" - echo " -S, --usesudo Use sudo when running pacman commands" + echo "$(gettext "Usage: %s [options] <destdir> <category> [category] ...")" "$0" + echo "$(gettext "Options:")" + echo "$(gettext " -b, --builddeps Build missing dependencies from source")" + echo "$(gettext " -B, --noccache Do not use ccache during build")" + echo "$(gettext " -c, --clean Clean up work files after build")" + echo "$(gettext " -C, --cleancache Clean up source files from the cache")" + echo "$(gettext " -d, --nodeps Skip all dependency checks")" + echo "$(gettext " -e, --noextract Do not extract source files (use existing src/ dir)")" + echo "$(gettext " -f, --force Overwrite existing packages")" + echo "$(gettext " -i, --install Install package after successful build")" + echo "$(gettext " -m, --nocolor Disable colorized output messages")" + echo "$(gettext " -h, --help This help")" + echo "$(gettext " -o, --nobuild Download and extract files only")" + echo "$(gettext " -r, --rmdeps Remove installed dependencies after a successful build")" + echo "$(gettext " -s, --syncdeps Install missing dependencies with pacman")" + echo "$(gettext " -S, --usesudo Use sudo when running pacman commands")" echo - echo "These options can be passed to pacman:" + echo "$(gettext "These options can be passed to pacman:")" echo - echo " --noconfirm Do not ask for confirmation when resolving dependencies" - echo " --noprogressbar Do not show a progress bar when downloading files" + echo "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")" + echo "$(gettext " --noprogressbar Do not show a progress bar when downloading files")" echo - echo "Where <category> is one or more directory names under the ABS root" - echo "eg: makeworld -c /packages base lib editors" + echo "$(gettext "Where <category> is one or more directory names under the ABS root")" + echo "$(gettext "eg: makeworld -c /packages base lib editors")" echo - echo "This should be run from the toplevel directory of ABS (usually /var/abs)" + echo "$(gettext "This should be run from the toplevel directory of ABS (usually /var/abs)")" } version() { printf "makeworld (pacman) %s\n" "$myver" - printf "\ + printf "$(gettext "\ Copyright (C) 2002-2007 Judd Vinet <jvinet(a)zeroflux.org>.\n\n\ This is free software; see the source for copying conditions.\n\ -There is NO WARRANTY, to the extent permitted by law.\n" +There is NO WARRANTY, to the extent permitted by law.\n")" } MAKEPKG_OPTS= -- 1.5.3.5 -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

2 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.0-603-g2aa7e69
by Dan McGee 19 Nov '07

19 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 2aa7e69da91c1d7a18473cf05df98c92bd1dc747 (commit) via 65fb99133df10143e07c237f04777e01b443c037 (commit) via 829a7b904dcb56aa17cd9279f29385dad2814793 (commit) via 5f0c241987f31b2cbf1c6ba2146dcca065973b0d (commit) via b118ce55bd01c7ebd42b5b6d4a0f34aa925701d8 (commit) via 55a7455135e2d8f2e118928f634dc7976ab6c8b4 (commit) via 8f824e70bbaf9cb2b72103fe378d93e3ded8cdee (commit) via e174865bdc154248b8b8fcf03eaa19da78e0f67b (commit) from e28973169d2e5eda8b64ebdda11ece0dc761d978 (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 2aa7e69da91c1d7a18473cf05df98c92bd1dc747 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun Nov 18 14:25:43 2007 +0100 Add the pmconflict_t type. pmdepmissing_t was used for two totally different things : missing dependencies, and dependency conflicts. So this patch simply adds a type for dep conflicts, and convert the code to use it. This fix the TODO in conflict.c : /* TODO WTF is a 'depmissing' doing indicating a conflict? */ Additionally, the code in conflict.c now eliminates the duplicated conflicts. If pkg1 conflicts with pkg2, and pkg2 conflicts with pkg1, only one of them will be stored. However the conflict handling in sync_prepare (sync.c) is still very asymetrical, and very ugly too. This should be improved in the future (there is already a pending patch from Nagy that cleans it a lot). Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 65fb99133df10143e07c237f04777e01b443c037 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sun Nov 18 10:29:55 2007 +0100 Simple s/conflict/fileconflict/ renaming. The names related to conflicts are misleading : For dependencies conflicts, the type is pmdepmissing, and the function names contain just "conflict". For file conflicts, the type is pmconflict, and some functions contained just "conflict", some others "fileconflict". So this is the first step for improving the situation. Original idea/patch from Nagy, but the patch already didn't apply anymore, so I did it again. The main difference is that I kept the conflictype, with the following renaming : pmconflicttype_t -> pmfileconflicttype_t PM_CONFLICT_TYPE_TARGET -> PM_FILECONFLICT_TARGET PM_CONFLICT_TYPE_FILE -> PM_FILECONFLICT_FILESYSTEM Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 829a7b904dcb56aa17cd9279f29385dad2814793 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Nov 17 23:35:22 2007 +0100 Minor rephrasing of the question asked by -Sc. Suggested by stonecrest on irc : 'I think "uninstalled" would be better, as it implies that the package was once installed and since removed. Otherwise a user might wonder why there are non-installed pkgs in cache' Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 5f0c241987f31b2cbf1c6ba2146dcca065973b0d Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 18 11:23:10 2007 -0600 POSIX shell does not specify meaning of source operation Just use '.' operator instead. Oops. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b118ce55bd01c7ebd42b5b6d4a0f34aa925701d8 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Nov 17 22:52:03 2007 +0100 Extend the -Sc operation to also clean up unused sync databases. We discussed this with stonecrest on IRC : 20:46 stonecrest >> someone brings up a good point.. why aren't repos that aren't in the pacman.conf removed from /var/lib/pacman? 20:46 stonecrest >> i have 118mb and 24 dirs in there, but only 5 repos at present 21:26 stonecrest >> shining: i guess you could prompt the user on deleting every dir in /var/lib/pacman.. since it shouldn't happen that often except for the first time 21:30 stonecrest >> could be part of pacman -Sc.. what else were you thinking? I already heard about this before, but it sounded dangerous to me. I didn't even think about a simple prompt. I also didn't know where this code would fit. And it fits well with -Sc, I borrowed most of the code from sync_cleancache. Example session : Cache directory: /var/cache/pacman/pkg/ Do you want to remove non-installed packages from cache? [Y/n] n Database directory: /var/lib/pacman/ Do you want to remove unused repositories? [Y/n] Do you want to remove /var/lib/pacman/sync/pacman-git? [Y/n] Do you want to remove /var/lib/pacman/sync/deltatest? [Y/n] Database directory cleaned up Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 55a7455135e2d8f2e118928f634dc7976ab6c8b4 Author: Nagy Gabor <ngaba(a)petra.hos.u-szeged.hu> Date: Sun Aug 12 23:41:30 2007 +0200 libalpm/deps.c : improves IgnorePkg handling in resolvedeps. resolvedeps will now search for other satisfiers when we don't let it add a package from IgnorePkg. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 8f824e70bbaf9cb2b72103fe378d93e3ded8cdee Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Fri Nov 16 15:34:04 2007 +0100 Remove the IgnorePkg handling from alpm_pkg_compare_version. And check the IgnorePkg handling is done correctly in the other places. For example, -Qu and -Su will automatically skip the ignored packages (-Su will print a warning), but -S will install ignored packages anyway, because it was asked explicitly. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit e174865bdc154248b8b8fcf03eaa19da78e0f67b Author: Dan McGee <dan(a)archlinux.org> Date: Sat Nov 17 12:56:31 2007 -0600 Don't filter package files output based on dir/file status This caused more problems than it solved, especially with -Qlp output and files that are new to the new package. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 6 +- lib/libalpm/alpm.h | 26 ++++++------- lib/libalpm/conflict.c | 92 +++++++++++++++++++++++++++++++++++--------- lib/libalpm/conflict.h | 11 ++++- lib/libalpm/db.c | 6 ++- lib/libalpm/deps.c | 81 +++++++++++++++------------------------ lib/libalpm/deps.h | 6 +-- lib/libalpm/package.c | 10 ----- lib/libalpm/remove.c | 2 +- lib/libalpm/sync.c | 99 ++++++++++++++++++++++------------------------- lib/libalpm/trans.c | 4 +- src/pacman/add.c | 23 +++++------ src/pacman/package.c | 12 +----- src/pacman/sync.c | 99 +++++++++++++++++++++++++++++++++++++++++------- 14 files changed, 282 insertions(+), 195 deletions(-) hooks/post-receive -- The official pacman repository

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.0-585-g2f55733
by Dan McGee 19 Nov '07

19 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 2f55733be35e7ec4188ddab17a92ed67faa7210d (commit) via c8243bb8ed2908e92d311a32d15e797dc83ba633 (commit) via f75ee7176235f2c1a531113985d715ddcafb6d05 (commit) via c244cfecf654d34032585530f00d68501ec63d77 (commit) via 8757398a7e3132166a2e20605c02dfdc2abc3d1d (commit) via ceb870655ec5c5efdd694328d0c4b8c98be99ebe (commit) via 7219326dd4d01d7e49b8a40746f5495c1c329c9c (commit) via f5fcaf0b3c8d05e94d08d6357324cfa69d8ceae7 (commit) via 1d57a3e801421f6ddd43522f1a0d1ebaacf7aa92 (commit) via 85b06f127600131e11afb3629e2609334dee00df (commit) from 46ec9e3548b5b567c7eb18c360f54a77b6313b12 (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 2f55733be35e7ec4188ddab17a92ed67faa7210d Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 13 00:37:11 2007 -0600 Ensure -Si and -Qi output show correct dependencies Because alpm_pkg_get_depends() no longer returns strings as the data, we need to first convert the returned structures to printable strings before we can print the list. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c8243bb8ed2908e92d311a32d15e797dc83ba633 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Nov 14 22:51:47 2007 -0600 libalpm: change graph malloc to MALLOC macro Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f75ee7176235f2c1a531113985d715ddcafb6d05 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Nov 14 22:51:16 2007 -0600 Fix alpm_list_copy_data So I spent a good 4 hours tracking a bug down tonight due to alpm_list_copy_data not actually doing what I expected to do. We can't find the size of an object we don't know the type of, so rewrite it so we pass in the size explicitly. This was making _alpm_pkg_dup fail and causing all sorts of other issues. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c244cfecf654d34032585530f00d68501ec63d77 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 12 23:01:14 2007 -0600 Move alpm_splitdep usage to db_read Holy inefficient batman! For a pacman -Qt operation (when we are using compute_requiredby and not database entries), splitdep was being called ~1.3 million times on my local database. By splitting when we read the DB, we drop this number to around 1700 and save a LOT of time in doing so (a 5x increase in pacman -Qt speed here). Note that the depends alpm_list_t in the package struct is no longer a string list, but a list of pmdepent_t objects. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8757398a7e3132166a2e20605c02dfdc2abc3d1d Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 12 21:28:13 2007 -0600 testdb: remove requiredby checking Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ceb870655ec5c5efdd694328d0c4b8c98be99ebe Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 12 19:45:03 2007 -0600 Remove REQUIREDBY checks from pactest Remove any checks dealing with requiredby from pactest (but not actually from the pactests themselves). Of course, we should probably find a new way to check requiredby values of packages since there is no guarantee our code is working perfectly. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7219326dd4d01d7e49b8a40746f5495c1c329c9c Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 12 19:40:08 2007 -0600 Remove REQUIREDBY usage from libalpm Instead of using the often-busted REQUIREDBY entries in the pacman database, compute them each time they are required. This should help many things: 1. Simplify the codebase 2. Prevent future database corruption 3. Ensure when we do use requiredby, it is always correct 4. Shrink the pmpkg_t memory overhead Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f5fcaf0b3c8d05e94d08d6357324cfa69d8ceae7 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed Nov 14 20:02:47 2007 +0100 new trans001.py pactest The pactest demonstrates what happens if fileconflict was found after the removal part of a sync transaction. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1d57a3e801421f6ddd43522f1a0d1ebaacf7aa92 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed Nov 14 19:56:41 2007 +0100 new add043.py pactest Currently alpm_depcmp uses pkg->version as a version number for provisions, which is odd. The failure of the pactest demonstrates this. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 85b06f127600131e11afb3629e2609334dee00df Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed Nov 14 12:42:15 2007 +0100 alpm_list_add == alpm_list_add_last It's time to define that alpm_list_add(list, foo) adds 'foo' to the end of 'list' and returns with 'list', because: 1. list is a list, not a set. 2. sortbydeps _needs_ an alpm_list_add definition to work properly. As a first step, I used this definition in recursedeps. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> [Dan: punctuation cleanup in commit message and code comments, added comment to alpm_list_add] Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 7 --- lib/libalpm/alpm.h | 1 - lib/libalpm/alpm_list.c | 14 ++++--- lib/libalpm/alpm_list.h | 2 +- lib/libalpm/be_files.c | 19 +++------ lib/libalpm/db.c | 1 - lib/libalpm/deps.c | 96 +++++++++++++++++++------------------------- lib/libalpm/deps.h | 2 +- lib/libalpm/package.c | 45 ++++----------------- lib/libalpm/package.h | 2 - lib/libalpm/remove.c | 19 +++------ lib/libalpm/sync.c | 49 ----------------------- lib/libalpm/trans.c | 65 ------------------------------ lib/libalpm/trans.h | 1 - pactest/pmdb.py | 7 +--- pactest/pmpkg.py | 1 - pactest/pmrule.py | 3 - pactest/tests/add043.py | 15 +++++++ pactest/tests/trans001.py | 20 +++++++++ src/pacman/package.c | 28 ++++++++++++- src/pacman/query.c | 4 +- src/util/testdb.c | 44 -------------------- 22 files changed, 136 insertions(+), 309 deletions(-) create mode 100644 pactest/tests/add043.py create mode 100644 pactest/tests/trans001.py hooks/post-receive -- The official pacman repository

3 2

[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