May 2008 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] contrib/paclist - list packages installed from given repo
by Allan McRae 09 May '08

09 May '08

The paclist script provides a simple method for monitoring which packages are installed from a given repo. This is particularly useful when using a testing or unstable repository. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- contrib/paclist | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) create mode 100644 contrib/paclist diff --git a/contrib/paclist b/contrib/paclist new file mode 100644 index 0000000..87592a5 --- /dev/null +++ b/contrib/paclist @@ -0,0 +1,51 @@ +#!/bin/bash +# paclist - List all packages installed from a given repo +# +# Copyright (C) 2008 Allan McRae <mcrae_allan(a)hotmail.com> +# +# 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/>. + + +readonly progname="paclist" +readonly version="1.0" + +if [ -z "$1" -o "$1" = "--help" -o "$1" = "-h" ]; then + echo "$progname - List all packages installed from a given repo" + echo "Usage: $progname <repo>" + echo "Example: $progname testing" + exit 0 +fi + +if [ "$1" = "--version" -o "$1" = "-v" ]; then + echo "$progname version $version" + echo "Copyright (C) 2008 Allan McRae" + exit 0 +fi + +pkglist=$(mktemp) +ret=0 +pacman -Sl $1 > $pkglist || ret=$? +if [ $ret -ne 0 ]; then + exit 1 +fi + +pacman -Q | while read pkg; do + ret=0 + grep -q "$pkg" $pkglist || ret=$? + if [ $ret -eq 0 ]; then + echo $pkg + fi +done + +rm $pkglist -- 1.5.5.1

2 3

[pacman-dev] pm_transflag enum
by Dario Freddi 09 May '08

09 May '08

Thanks Aaron, Casts were the right thing to do, though this is the right way to cast (the only one I found that actually works): flags = (pmtransflag_t) ((pmtransflag_t)flags | (pmtransflag_t)PM_TRANS_FLAG_FORCE); Thanks for your help! Cheers Dario

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-139-gdf5024f
by Dan McGee 09 May '08

09 May '08

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 df5024fd64de5b033ed76d3ea347a1126572cbc3 (commit) via 081ba4816ee90e59be31a14da6e7ac2ea5a10db8 (commit) via 7fccfc78195f257e907ff4f04294ef743559017a (commit) via a13bf7497948b27786a1d568264d91b8fa60491b (commit) from 5389cdf65431e6daf219b9bb8f8985c6c33b1996 (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 df5024fd64de5b033ed76d3ea347a1126572cbc3 Author: Dan McGee <dan(a)archlinux.org> Date: Sun May 4 20:51:04 2008 -0500 Use strdup() instead of a static buffer We only need a copy of this string once we know we are going to extract it, and we don't need a static buffer to copy it into since it is coming from a known-length string. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 081ba4816ee90e59be31a14da6e7ac2ea5a10db8 Author: Dan McGee <dan(a)archlinux.org> Date: Sun May 4 20:48:32 2008 -0500 Update md5 routines XySSL 0.9 was released; sync our code with the upstream source. Note that there weren't any real changes besides renaming of macros, so nothing much to see here. The biggest change may be the licence- it is now GPL/BSD software rather than LGPL/BSD. The license header is changed to reflect this. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7fccfc78195f257e907ff4f04294ef743559017a Author: Dan McGee <dan(a)archlinux.org> Date: Sun May 4 19:34:03 2008 -0500 be_files.c: PATH_MAX cleanup Most of these are not easy to remove, but I could kill the ones in the two lastupdate functions. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a13bf7497948b27786a1d568264d91b8fa60491b Author: Dan McGee <dan(a)archlinux.org> Date: Sun May 4 19:15:49 2008 -0500 pacman-side code cleanups When taking a look at PATH_MAX usage, I found a few small things we can clean up or fix. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 38 +++++++++++++-------- lib/libalpm/be_files.c | 19 +++++++--- lib/libalpm/md5.c | 86 +++++++++++++++++++++++------------------------ lib/libalpm/md5.h | 29 +++++----------- src/pacman/package.c | 7 +--- src/pacman/query.c | 9 +++-- src/pacman/sync.c | 4 +- 7 files changed, 97 insertions(+), 95 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] pm_transflag enum
by Dario Freddi 08 May '08

08 May '08

Hello, I know this might look as a stupid question, though I can't manage to use multiple flags, just as pacman does. This bunch of code: pmtransflag_t flgs = PM_TRANS_FLAG_NOSCRIPTLET; flgs |= PM_TRANS_FLAG_FORCE; Simply doesn't compile, returning: /home/drf/Development/shaman/trunk/shaman/src/AlpmHandler.cpp: In member function ‘bool AlpmHandler::initTransaction(pmtranstype_t, pmtransflag_t, bool)’: /home/drf/Development/shaman/trunk/shaman/src/AlpmHandler.cpp:155: error: invalid conversion from ‘int’ to ‘pmtransflag_t’ Though, pacman just does it this way, so I can't get where I am wrong. Any help would be appreciated. Cheers Dario

2 1

[pacman-dev] makepkg -b is wrong
by Diogo Dutra 07 May '08

07 May '08

Hi guys, I have found a bug in makepkg, the makepkg -b dont install builded packages as depencies, it install as explicited packages and it is not good, I make a patch that revolve this problem. Im sorry for any mistakes of mine.

6 15

[pacman-dev] Conditional dependencies
by Nagy Gabor 05 May '08

05 May '08

Hi! This may be a crazy idea, but I bring this on. I've read some bugs on bug tracker, and I saw that "your kernel is too old" sometimes. The problem is, that many users use custom kernel (like me), that's why we cannot add 'kernel26>=...' dependency to glibc for example. However, some users use arch-built kernel, and they may break their system after installing a new glibc (well, at least a warning in .install file would be helpful here). So as a compromise, we could introduce a new type of dependency which can be satisfied iff the user has no package (provision) installed defined by dependency-name (and he gets a warning similar to the helpful .install script) or it is installed the dependency is satisfied treated as normal dependency. Thus a glibc update would force a kernel update if needed but would never force kernel _add_. Bye

3 4

[pacman-dev] Incoherent alpm_list_t usage in deps.c
by Nagy Gabor 03 May '08

03 May '08

Hi! Both resolvedeps and recursedeps populates its input list; however, resolvedeps has alpm_list_t**, recursedeps has alpm_list_t* param. First I thought that the return value of alpm_list_add is needless, since we add the new element to the end of the list. But, when the list is empty (thus the passed param is NULL), the return value is important. Neither of the mentioned functions should populate its input list, if it is empty; so both * and ** seems to be correct (however, by definition, resolvedeps could populate an empty list, but - after DEPENDSONLY removal - syncpkg is always a member of *list). Bye

2 1

[pacman-dev] [PATCH] One liner _alpm_pkg_find
by Nagy Gabor 02 May '08

02 May '08

From f08d8647274fc2c582005f9f0baebc114b2829cd Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri, 2 May 2008 00:32:45 +0200 Subject: [PATCH] One liner _alpm_pkg_find This patch kills some code duplication. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/package.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index ab49492..313c84a 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -1095,22 +1095,8 @@ error: */ pmpkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle) { - alpm_list_t *lp; - ALPM_LOG_FUNC; - - if(needle == NULL || haystack == NULL) { - return(NULL); - } - - for(lp = haystack; lp; lp = lp->next) { - pmpkg_t *info = lp->data; - - if(info && strcmp(alpm_pkg_get_name(info), needle) == 0) { - return(info); - } - } - return(NULL); + return(alpm_list_find(haystack, needle, _alpm_pkgname_pkg_cmp)); } /** Test if a package should be ignored. -- 1.5.3.8

1 0

[pacman-dev] [PATCH] Swap the parameters of alpm_pkg_find (resubmit)
by Nagy Gabor 02 May '08

02 May '08

From 6a15dd711a033609ad6ac007f8c55ac1ce045206 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu, 1 May 2008 23:58:33 +0200 Subject: [PATCH] Swap the parameters of alpm_pkg_find Now the syntax is coherent with alpm_list_find and alpm_sync_find. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/cache.c | 2 +- lib/libalpm/deps.c | 12 ++++++------ lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 2 +- lib/libalpm/remove.c | 4 ++-- lib/libalpm/sync.c | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/libalpm/cache.c b/lib/libalpm/cache.c index bfc4fd9..77cd292 100644 --- a/lib/libalpm/cache.c +++ b/lib/libalpm/cache.c @@ -171,7 +171,7 @@ pmpkg_t *_alpm_db_get_pkgfromcache(pmdb_t *db, const char *target) return(NULL); } - return(_alpm_pkg_find(target, pkgcache)); + return(_alpm_pkg_find(pkgcache, target)); } /* Returns a new group cache from db. diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index b171ccc..9cae0e2 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -440,7 +440,7 @@ static int can_remove_package(pmdb_t *db, pmpkg_t *pkg, alpm_list_t *targets, { alpm_list_t *i, *j; - if(_alpm_pkg_find(alpm_pkg_get_name(pkg), targets)) { + if(_alpm_pkg_find(targets, alpm_pkg_get_name(pkg))) { return(0); } @@ -464,7 +464,7 @@ static int can_remove_package(pmdb_t *db, pmpkg_t *pkg, alpm_list_t *targets, pmpkg_t *lpkg = i->data; for(j = alpm_pkg_get_depends(lpkg); j; j = j->next) { if(alpm_depcmp(pkg, j->data)) { - if(!_alpm_pkg_find(lpkg->name, targets)) { + if(!_alpm_pkg_find(targets, lpkg->name)) { return(0); } break; @@ -571,8 +571,8 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg, if(!sync) { continue; } - found = alpm_depcmp(sync, missdep) && !_alpm_pkg_find(alpm_pkg_get_name(sync), remove) - && !_alpm_pkg_find(alpm_pkg_get_name(sync), *list); + found = alpm_depcmp(sync, missdep) && !_alpm_pkg_find(remove, alpm_pkg_get_name(sync)) + && !_alpm_pkg_find(*list, alpm_pkg_get_name(sync)); if(!found) { continue; } @@ -594,8 +594,8 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg, continue; } found = alpm_depcmp(sync, missdep) && strcmp(sync->name, missdep->name) - && !_alpm_pkg_find(alpm_pkg_get_name(sync), remove) - && !_alpm_pkg_find(alpm_pkg_get_name(sync), *list); + && !_alpm_pkg_find(remove, alpm_pkg_get_name(sync)) + && !_alpm_pkg_find(*list, alpm_pkg_get_name(sync)); if(!found) { continue; } diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index ffaa96b..ab49492 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -1093,7 +1093,7 @@ error: /* Test for existence of a package in a alpm_list_t* * of pmpkg_t* */ -pmpkg_t *_alpm_pkg_find(const char *needle, alpm_list_t *haystack) +pmpkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle) { alpm_list_t *lp; diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 0ba8aac..99cd47d 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -82,7 +82,7 @@ int _alpm_pkg_cmp(const void *p1, const void *p2); int _alpm_pkgname_pkg_cmp(const void *pkgname, const void *package); int _alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg); pmpkg_t *_alpm_pkg_load(const char *pkgfile, unsigned short full); -pmpkg_t *_alpm_pkg_find(const char *needle, alpm_list_t *haystack); +pmpkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle); int _alpm_pkg_should_ignore(pmpkg_t *pkg); #endif /* _ALPM_PACKAGE_H */ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index f2e84ef..c70e2b9 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -56,7 +56,7 @@ int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - if(_alpm_pkg_find(name, trans->packages)) { + if(_alpm_pkg_find(trans->packages, name)) { RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); } @@ -92,7 +92,7 @@ static void remove_prepare_cascade(pmtrans_t *trans, pmdb_t *db, pmdepmissing_t *miss = (pmdepmissing_t *)i->data; pmpkg_t *info = _alpm_db_get_pkgfromcache(db, miss->target); if(info) { - if(!_alpm_pkg_find(alpm_pkg_get_name(info), trans->packages)) { + if(!_alpm_pkg_find(trans->packages, alpm_pkg_get_name(info))) { _alpm_log(PM_LOG_DEBUG, "pulling %s in the targets list\n", alpm_pkg_get_name(info)); trans->packages = alpm_list_add(trans->packages, _alpm_pkg_dup(info)); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 357b01f..3743f9b 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -227,7 +227,7 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, for(i = _alpm_db_get_pkgcache(db_local); i; i = i->next) { pmpkg_t *local = i->data; - if(_alpm_pkg_find(alpm_pkg_get_name(local), replaced)) { + if(_alpm_pkg_find(replaced, alpm_pkg_get_name(local))) { _alpm_log(PM_LOG_DEBUG, "'%s' is already elected for removal -- skipping\n", alpm_pkg_get_name(local)); continue; @@ -583,7 +583,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync int found = 0; for(j = trans->packages; j && !found; j = j->next) { pmsyncpkg_t *sync = j->data; - if(_alpm_pkg_find(conflict->package2, sync->removes)) { + if(_alpm_pkg_find(sync->removes, conflict->package2)) { found = 1; } } @@ -954,7 +954,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) alpm_list_t *j; for(j = sync->removes; j; j = j->next) { pmpkg_t *pkg = j->data; - if(!_alpm_pkg_find(pkg->name, tr->packages)) { + if(!_alpm_pkg_find(tr->packages, pkg->name)) { if(_alpm_trans_addtarget(tr, pkg->name) == -1) { goto error; } -- 1.5.3.8

2 1

[pacman-dev] [PATCH] Unify the order of alpm_list_fn_cmp parameters
by Nagy Gabor 02 May '08

02 May '08

From 82de17753e8be6c125781e331cd8b526876008fb Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri, 2 May 2008 00:25:08 +0200 Subject: [PATCH] Unify the order of alpm_list_fn_cmp parameters In some cases we pass tricky asymmetric alpm_list_fn_cmp functions to alpm_list_find and alpm_list_remove, and the order of parameters wasn't coherent. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm_list.c | 2 +- lib/libalpm/db.c | 2 +- lib/libalpm/deps.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index ae54e19..ecfef25 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -577,7 +577,7 @@ void SYMEXPORT *alpm_list_find(const alpm_list_t *haystack, const void *needle, { const alpm_list_t *lp = haystack; while(lp) { - if(lp->data && fn(lp->data, needle) == 0) { + if(lp->data && fn(needle, lp->data) == 0) { return(lp->data); } lp = lp->next; diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index e8ae11a..bc11ad7 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -627,7 +627,7 @@ pmdb_t *_alpm_db_register_sync(const char *treename) * * @return "provision.name" == needle (as string) */ -int _alpm_prov_cmp(const void *provision, const void *needle) +int _alpm_prov_cmp(const void *needle, const void *provision) { char *tmpptr; char *provname = strdup(provision); diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 9cae0e2..bbc8cd5 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -195,7 +195,7 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse) } /* Little helper function for alpm_list_find */ -static int satisfycmp(const void *pkg, const void *depend) +static int satisfycmp(const void *depend, const void *pkg) { return(!alpm_depcmp((pmpkg_t*) pkg, (pmdepend_t*) depend)); } -- 1.5.3.8

1 0