- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-165-g35b9dfc
by dan＠archlinux.org 19 May '09

19 May '09

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 35b9dfc3805821cb504231a5e5ce5a8694278fb7 (commit) via c301d6aa250620fda6b268e17e1b0dd41027e90b (commit) from 0bf340f73c1b1705ab9314955c931a83e15fecb3 (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 35b9dfc3805821cb504231a5e5ce5a8694278fb7 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Tue May 12 00:45:18 2009 -0300 Remove unused included headers from testdb.c and testpkg.c libgen.h was used for basename() in function main() from src/util/testdb.c string.h was used for strlen() in function output_cb() from src/util/testpkg.c Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c301d6aa250620fda6b268e17e1b0dd41027e90b Author: Pierre Schmitz <pierre(a)archlinux.de> Date: Wed May 13 08:21:11 2009 +0200 Add support for the xz archive format This simple patch adds support for the xz archive format to makepkg and repo- add. Xz can be used as source, package and package db file type. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> [Dan: fixed a few alignment issues] Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 5 +++++ scripts/repo-add.sh.in | 1 + src/util/testdb.c | 1 - src/util/testpkg.c | 1 - 4 files changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-163-g0bf340f
by dan＠archlinux.org 19 May '09

19 May '09

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 0bf340f73c1b1705ab9314955c931a83e15fecb3 (commit) via 882bff36acad5c47df5b35fd3afb411dc4f092b0 (commit) via f89f7e136ba8d923680a6d0342d5e51d4fda1570 (commit) from 212ea8a9ed342efe2d74655cdebf668cc0cc7ce2 (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 0bf340f73c1b1705ab9314955c931a83e15fecb3 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Apr 18 17:35:08 2009 +0200 Remove unused error codes and handle PM_ERR_RETRIEVE by alpm_strerror() Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 882bff36acad5c47df5b35fd3afb411dc4f092b0 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Mon Apr 13 15:08:38 2009 +0200 Remove find_replacements() "Foo replaces bar" simply means that "foo is a new version of bar". So this patch refactors the code to use this "rule". _alpm_sync_sysupgrade now does the following for each local package [bar] (pseudo-code): for db in syncdbs { if(db contains bar) {check if db/bar is an upgrade; break;} replacers = find(bar replacers in db); if(replacers!=NULL) {ask_user; break;} } Note: 1. Replacers are grouped per repo. If more than one package replace bar in a repo, all of them are considered ("package set of bar replacers"). 2. If repo1/foo1 and repo2/foo2 both replaces bar, only repo1/foo1 is considered (if repo1 stands before repo2 in pacman.conf). FS#11737 is fixed. 3. It can happen that pacman doesn't consider any replacer, if it found a literal "earlier", so sync132.py modified accordingly (btw, that situation should not appear irl). The new sysupgrade code doesn't use sync_newversion(), so I removed the "local is newer than repo" message, which was annoying with -Qu and SyncFirst. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f89f7e136ba8d923680a6d0342d5e51d4fda1570 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu May 14 16:15:20 2009 +0200 Query documentation updates The old documentation didn't emphasize our filtering options at all, and it was a bit misleading. ("List ALL...") I also clarified the description of -Qu. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.8.txt | 28 ++++--- lib/libalpm/alpm.h | 9 -- lib/libalpm/error.c | 17 +---- lib/libalpm/sync.c | 200 ++++++++++++++++++--------------------------- pactest/tests/sync132.py | 4 +- src/pacman/pacman.c | 10 +- 6 files changed, 106 insertions(+), 162 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Query documentation updates
by Nagy Gabor 19 May '09

19 May '09

>From 8f675582f8f0098ec524fa702c38058c687e53fd Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu, 14 May 2009 16:15:20 +0200 Subject: [PATCH] Query documentation updates The old documentation didn't emphasize our filtering options at all, and it was a bit misleading. ("List ALL...") I also clarified the description of -Qu. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.8.txt | 28 +++++++++++++++++----------- src/pacman/pacman.c | 10 +++++----- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 37680be..4582be5 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -33,7 +33,10 @@ Operations packages and their files, as well as meta-information about individual packages (dependencies, conflicts, install date, build date, size). This can be run against the local package database or can be used on - individual '.tar.gz' packages. See <<QO,Query Options>> below. + individual '.tar.gz' packages. In the first case, if no package names + are provided in the command line, all installed packages will be + queried. Additionally, various filters can be applied on the package + list. See <<QO,Query Options>> below. *-R, \--remove*:: Remove a package from the system. Groups can also be specified to be @@ -164,16 +167,17 @@ Query Options[[QO]] it will be shown if available. *-d, \--deps*:: - List all packages installed as dependencies. This option can be combined - with '-t' for listing real orphans- packages that were installed as - dependencies but are no longer required by any installed package. ('-Qdt' - is equivalent to the pacman 3.0.X '-Qe' option.) + Restrict or filter output to packages installed as dependencies. This + option can be combined with '-t' for listing real orphans- packages that + were installed as dependencies but are no longer required by any + installed package. ('-Qdt' is equivalent to the pacman 3.0.X '-Qe' + option.) *-e, \--explicit*:: - List all packages explicitly installed. This option can be combined with - '-t' to list top-level packages- those packages that were explicitly - installed but are not required by any other package. ('-Qet' is equivalent - to the pacman 2.9.X '-Qe' option.) + Restrict or filter output to packages explicitly installed. This option + can be combined with '-t' to list top-level packages- those packages + that were explicitly installed but are not required by any other + package. ('-Qet' is equivalent to the pacman 2.9.X '-Qe' option.) *-g, \--groups*:: Display all packages that are members of a named group. If a name is not @@ -221,8 +225,10 @@ Query Options[[QO]] installed package. *-u, \--upgrades*:: - Lists all packages that are out of date on the local system. This option - works best if the sync database is refreshed using '-Sy'. + Restrict or filter output to packages that are out of date on the local + system. (Only package versions are used to find outdated packages, + replacements are not checked here.) This option works best if the sync + database is refreshed using '-Sy'. Remove Options[[RO]] diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 14cfdfa..72a72ba 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -103,17 +103,17 @@ static void usage(int op, const char * const myname) printf("%s: %s {-Q --query} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); printf(_(" -c, --changelog view the changelog of a package\n")); - printf(_(" -d, --deps list all packages installed as dependencies\n")); - printf(_(" -e, --explicit list all packages explicitly installed\n")); + printf(_(" -d, --deps list packages installed as dependencies [filter]\n")); + printf(_(" -e, --explicit list packages explicitly installed [filter]\n")); printf(_(" -g, --groups view all members of a package group\n")); printf(_(" -i, --info view package information (-ii for backup files)\n")); printf(_(" -l, --list list the contents of the queried package\n")); - printf(_(" -m, --foreign list installed packages not found in sync db(s)\n")); + printf(_(" -m, --foreign list installed packages not found in sync db(s) [filter]\n")); printf(_(" -o, --owns <file> query the package that owns <file>\n")); printf(_(" -p, --file <package> query a package file instead of the database\n")); printf(_(" -s, --search <regex> search locally-installed packages for matching strings\n")); - printf(_(" -t, --unrequired list all packages not required by any package\n")); - printf(_(" -u, --upgrades list all outdated packages\n")); + printf(_(" -t, --unrequired list packages not required by any package [filter]\n")); + printf(_(" -u, --upgrades list outdated packages [filter]\n")); printf(_(" -q, --quiet show less information for query and search\n")); } else if(op == PM_OP_SYNC) { printf("%s: %s {-S --sync} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); -- 1.6.0.3

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-160-g212ea8a
by dan＠archlinux.org 19 May '09

19 May '09

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 212ea8a9ed342efe2d74655cdebf668cc0cc7ce2 (commit) via a812ad4ea4faeb5cb229a574adef47764840f890 (commit) via 1bbb34365c437ebdf85874f39474bce37c4b7144 (commit) via 1d8d932fa65d920ab4d43d90f3227c17714f4f14 (commit) via 783e710839d6de059b95e8ed117bdcee1233720f (commit) via c5d9b999c76dceb077d5d5332b440a12698e8519 (commit) via 4a582fac2a24b6fca170721ec7adcca9239457ff (commit) via 86cd72573b03297044112e50a88bd651190aa284 (commit) via 80caeabce0f28125f3b68388996ce39e58f2e5e8 (commit) via 250e66e57b6a187b5643ea6db088552e4efef488 (commit) via 5e32928a42366fd3df27ffe108b44fcfe35617dd (commit) via de44a0f474f4e78359b890644645bd7e153983d2 (commit) from 20017354f7ccb58bf4f78691985a5d237f4dbc90 (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 212ea8a9ed342efe2d74655cdebf668cc0cc7ce2 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue May 12 11:01:58 2009 +0200 repo-add: fix -n tests which are applicable only to strings Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a812ad4ea4faeb5cb229a574adef47764840f890 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue May 12 11:09:11 2009 +0200 libarchive development has moved to Google Code Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1bbb34365c437ebdf85874f39474bce37c4b7144 Author: Dan McGee <dan(a)archlinux.org> Date: Mon May 18 23:00:16 2009 -0500 Add pyc files to autoclean Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1d8d932fa65d920ab4d43d90f3227c17714f4f14 Author: Dan McGee <dan(a)archlinux.org> Date: Mon May 18 22:59:54 2009 -0500 Remove recursive remove in autoclean.sh Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 783e710839d6de059b95e8ed117bdcee1233720f Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Tue May 12 12:54:49 2009 -0300 Add more files to cleanup in autoclean.sh Add files pactest/tests/Makefile.in , pactest/tests/Makefile and contrib/Makefile.in , contrib/Makefile to list of cleanup script. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c5d9b999c76dceb077d5d5332b440a12698e8519 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Tue May 12 13:04:11 2009 -0300 Add repo-remove.8 to list of cleanup in doc/Makefile.am repo-remove.8 is generated with Makefile but is not removed on clean. This patch add it to list of untracked autoconf files. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4a582fac2a24b6fca170721ec7adcca9239457ff Merge: 86cd72573b03297044112e50a88bd651190aa284 80caeabce0f28125f3b68388996ce39e58f2e5e8 Author: Dan McGee <dan(a)archlinux.org> Date: Mon May 18 22:51:25 2009 -0500 Merge commit 'allan/working' commit 86cd72573b03297044112e50a88bd651190aa284 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Mon May 18 01:56:06 2009 -0300 Add an initial pactest/test/.gitignore Add an initial pactest/test/.gitignore to exclude sync200.py that is generated from sync200.py.in Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 80caeabce0f28125f3b68388996ce39e58f2e5e8 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 16 14:39:18 2009 +1000 NEWS file updates for makepkg and contrib Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 250e66e57b6a187b5643ea6db088552e4efef488 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 16 13:48:10 2009 +1000 makepkg: fix sourcing BUILDSCRIPT and PATH issues The bash source command looks in the users PATH for the file to source before the local directory. This causes issues when someone has a PKGBUILD somewhere in their path (for unknown some reason...). Fixes FS#14727. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5e32928a42366fd3df27ffe108b44fcfe35617dd Author: Allan McRae <allan(a)archlinux.org> Date: Mon May 11 01:16:51 2009 +1000 makepkg: Document package splitting Signed-off-by: Allan McRae <allan(a)archlinux.org> commit de44a0f474f4e78359b890644645bd7e153983d2 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 26 19:52:29 2009 +1000 makepkg: do not update pkgver when building source package When making a source package for a SCM PKGBUILD, makepkg should not update the pkgver/pkgrel. Noted in FS#14456. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: INSTALL | 2 +- NEWS | 20 ++++++++++++++++ autoclean.sh | 57 ++++++++++++++++++++++++--------------------- doc/Makefile.am | 2 +- doc/PKGBUILD.5.txt | 27 +++++++++++++++++----- doc/makepkg.8.txt | 6 ++-- pactest/tests/.gitignore | 1 + scripts/makepkg.sh.in | 18 +++++++------- scripts/repo-add.sh.in | 4 +- 9 files changed, 88 insertions(+), 49 deletions(-) create mode 100644 pactest/tests/.gitignore hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 2/3] repo-add: fix -n tests which are applicable only to strings
by Cedric Staniewski 19 May '09

19 May '09

Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- scripts/repo-add.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 13097df..eb8837c 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -245,8 +245,8 @@ db_write_entry() echo -e "%VERSION%\n$pkgver\n" >>desc [ -n "$pkgdesc" ] && echo -e "%DESC%\n$pkgdesc\n" >>desc write_list_entry "GROUPS" "$_groups" "desc" - [ -n $csize ] && echo -e "%CSIZE%\n$csize\n" >>desc - [ -n $size ] && echo -e "%ISIZE%\n$size\n" >>desc + [ -n "$csize" ] && echo -e "%CSIZE%\n$csize\n" >>desc + [ -n "$size" ] && echo -e "%ISIZE%\n$size\n" >>desc # compute checksums msg2 "$(gettext "Computing md5 checksums...")" -- 1.6.3

2 1

[pacman-dev] [PATCH] libarchive development has moved to Google Code
by Cedric Staniewski 19 May '09

19 May '09

Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- INSTALL | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/INSTALL b/INSTALL index 3127cd3..f9989d5 100644 --- a/INSTALL +++ b/INSTALL @@ -14,7 +14,7 @@ You will need to build and install two libraries before you can properly build pacman. libarchive -http://people.freebsd.org/~kientzle/libarchive/ +http://code.google.com/p/libarchive/ libfetch ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/net/libfetch/README.html -- 1.6.3

2 1

[pacman-dev] [PATCH] Add repo-remove.8 to list of cleanup in doc/Makefile.am
by Gerardo Exequiel Pozzi 19 May '09

19 May '09

repo-remove.8 is generated with Makefile but is not removed on clean. This patch add it to list of untracked autoconf files. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- doc/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index a796a91..4703b63 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -51,7 +51,7 @@ EXTRA_DIST = \ $(DOXYGEN_MANS) # Files that should be removed, but which Automake does not know. -MOSTLYCLEANFILES = *.xml $(ASCIIDOC_MANS) $(HTML_DOCS) +MOSTLYCLEANFILES = *.xml $(ASCIIDOC_MANS) $(HTML_DOCS) repo-remove.8 # Ensure manpages are fresh when building a dist tarball dist-hook: -- 1.6.3

2 1

[pacman-dev] [PATCH] makepkg: fix sourcing BUILDSCRIPT and PATH issues
by Allan McRae 19 May '09

19 May '09

The bash source command looks in the users PATH for the file to source before the local directory. This causes issues when someone has a PKGBUILD somewhere in their path (for unknown some reason...). Fixes FS#14727. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index fefcc73..f94f925 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1527,6 +1527,7 @@ if [ ! -f "$BUILDSCRIPT" ]; then else # PKGBUILD passed through a pipe BUILDSCRIPT=/dev/stdin + source "$BUILDSCRIPT" fi else crlftest=$(file $BUILDSCRIPT | grep -F 'CRLF' || true) @@ -1534,9 +1535,9 @@ else error "$(gettext "%s contains CRLF characters and cannot be sourced.")" "$BUILDSCRIPT" exit 1 fi -fi -source "$BUILDSCRIPT" + source ./"$BUILDSCRIPT" +fi if [ "$GENINTEG" -eq 1 ]; then mkdir -p "$srcdir" -- 1.6.3.1

2 1

[pacman-dev] [PATCH 1/2] Introduce PM_TRANS_FLAG_NOLOCK
by Nagy Gabor 19 May '09

19 May '09

From afa07db77af2896b407b24c6ef69bb19f6b80417 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 16 May 2009 16:54:21 +0200 Subject: [PATCH 1/2] Introduce PM_TRANS_FLAG_NOLOCK This flag indicates that the front-end will not call alpm_trans_commit(), so the database needn't be locked. This is the first step toward fixing FS#8905. If this flag is set, alpm_trans_commit() does nothing and returns with an error (that has new code: PM_ERR_TRANS_NOT_LOCKED). Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm.h | 4 +++- lib/libalpm/error.c | 2 ++ lib/libalpm/trans.c | 32 ++++++++++++++++++++------------ 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2a6c2e0..1e22a59 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -276,7 +276,8 @@ typedef enum _pmtransflag_t { PM_TRANS_FLAG_NEEDED = 0x2000, PM_TRANS_FLAG_ALLEXPLICIT = 0x4000, PM_TRANS_FLAG_UNNEEDED = 0x8000, - PM_TRANS_FLAG_RECURSEALL = 0x10000 + PM_TRANS_FLAG_RECURSEALL = 0x10000, + PM_TRANS_FLAG_NOLOCK = 0x20000 } pmtransflag_t; /** @@ -487,6 +488,7 @@ enum _pmerrno_t { PM_ERR_TRANS_NOT_PREPARED, PM_ERR_TRANS_ABORT, PM_ERR_TRANS_TYPE, + PM_ERR_TRANS_NOT_LOCKED, /* Packages */ PM_ERR_PKG_NOT_FOUND, PM_ERR_PKG_IGNORED, diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 47f0750..fdff9ed 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -99,6 +99,8 @@ const char SYMEXPORT *alpm_strerror(int err) return _("transaction aborted"); case PM_ERR_TRANS_TYPE: return _("operation not compatible with the transaction type"); + case PM_ERR_TRANS_NOT_LOCKED: + return _("transaction commit attempt when database is not locked"); /* Packages */ case PM_ERR_PKG_NOT_FOUND: return _("could not find or read package"); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index b144b2a..6e74f3f 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -71,9 +71,11 @@ int SYMEXPORT alpm_trans_init(pmtranstype_t type, pmtransflag_t flags, ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1)); /* lock db */ - handle->lckfd = _alpm_lckmk(); - if(handle->lckfd == -1) { - RET_ERR(PM_ERR_HANDLE_LOCK, -1); + if(!(flags & PM_TRANS_FLAG_NOLOCK)) { + handle->lckfd = _alpm_lckmk(); + if(handle->lckfd == -1) { + RET_ERR(PM_ERR_HANDLE_LOCK, -1); + } } handle->trans = _alpm_trans_new(); @@ -158,6 +160,8 @@ int SYMEXPORT alpm_trans_commit(alpm_list_t **data) ASSERT(handle->trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(handle->trans->state == STATE_PREPARED, RET_ERR(PM_ERR_TRANS_NOT_PREPARED, -1)); + ASSERT(!(handle->trans->flags & PM_TRANS_FLAG_NOLOCK), RET_ERR(PM_ERR_TRANS_NOT_LOCKED, -1)); + return(_alpm_trans_commit(handle->trans, data)); } @@ -199,19 +203,23 @@ int SYMEXPORT alpm_trans_release() ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(trans->state != STATE_IDLE, RET_ERR(PM_ERR_TRANS_NULL, -1)); + int nolock_flag = trans->flags & PM_TRANS_FLAG_NOLOCK; + _alpm_trans_free(trans); handle->trans = NULL; /* unlock db */ - if(handle->lckfd != -1) { - while(close(handle->lckfd) == -1 && errno == EINTR); - handle->lckfd = -1; - } - if(_alpm_lckrm()) { - _alpm_log(PM_LOG_WARNING, _("could not remove lock file %s\n"), - alpm_option_get_lockfile()); - alpm_logaction("warning: could not remove lock file %s\n", - alpm_option_get_lockfile()); + if(!nolock_flag) { + if(handle->lckfd != -1) { + while(close(handle->lckfd) == -1 && errno == EINTR); + handle->lckfd = -1; + } + if(_alpm_lckrm()) { + _alpm_log(PM_LOG_WARNING, _("could not remove lock file %s\n"), + alpm_option_get_lockfile()); + alpm_logaction("warning: could not remove lock file %s\n", + alpm_option_get_lockfile()); + } } return(0); -- 1.6.3.1

2 1

[pacman-dev] Patch for srcpac to work with current makepkg
by u no hu 19 May '09

19 May '09

From: unohu <unohu0(a)gmail.com> Date: Fri, 15 May 2009 18:33:55 +0530 Subject: [PATCH] 2 bugfixes Replaced outdated makepkg option b with s copy all files instead of just PKGBUILD --- srcpac | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpac b/srcpac index 3445c58..45f1b5d 100755 --- a/srcpac +++ b/srcpac @@ -129,13 +129,13 @@ build_packages() fi mkdir -p ${builddir} - cp ${pkgdir}/PKGBUILD ${builddir} + cp ${pkgdir}/* ${builddir} # apply configuration apply_config ${pkg} ${builddir} # seperate out our makepkg flags - MAKEPKGOPTS="-c -b -r -f" + MAKEPKGOPTS="-c -s -r -f" cd ${builddir} -- 1.6.2.3

3 3

[pacman-dev] [PATCH] Add an initial pactest/test/.gitignore
by Gerardo Exequiel Pozzi 19 May '09

19 May '09

Add an initial pactest/test/.gitignore to exclude sync200.py that is generated from sync200.py.in Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- pactest/tests/.gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 pactest/tests/.gitignore diff --git a/pactest/tests/.gitignore b/pactest/tests/.gitignore new file mode 100644 index 0000000..665d9ce --- /dev/null +++ b/pactest/tests/.gitignore @@ -0,0 +1 @@ +sync200.py -- 1.6.3.1

2 1

[pacman-dev] [PATCH 2/2] We don't need root with -Sp
by Nagy Gabor 16 May '09

16 May '09

From 4531be12ace34a952e5d84e70f464f4643957793 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 16 May 2009 17:59:45 +0200 Subject: [PATCH 2/2] We don't need root with -Sp FS#8905 is fixed. The front-end passes PM_TRANS_FLAG_NOLOCK to the back-end, so it doesn't lock the database. That's why we don't need root anymore. I reworked (and renamed) needs_transaction() accordingly. I also added missing -Sc check there (for example, -Sci didn't print non-root error, but pacman wanted to lock the database). Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- src/pacman/pacman.c | 3 ++- src/pacman/util.c | 19 ++++++++----------- src/pacman/util.h | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index b94b28e..3b8636c 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -481,6 +481,7 @@ static int parseargs(int argc, char *argv[]) config->op_q_isfile = 1; config->op_s_printuris = 1; config->flags |= PM_TRANS_FLAG_NOCONFLICTS; + config->flags |= PM_TRANS_FLAG_NOLOCK; break; case 'q': config->quiet = 1; @@ -900,7 +901,7 @@ int main(int argc, char *argv[]) #if defined(HAVE_GETEUID) && !defined(CYGWIN) /* check if we have sufficient permission for the requested operation */ - if(myuid > 0 && needs_transaction()) { + if(myuid > 0 && needs_root()) { pm_printf(PM_LOG_ERROR, _("you cannot perform this operation unless you are root.\n")); cleanup(EXIT_FAILURE); } diff --git a/src/pacman/util.c b/src/pacman/util.c index a280252..8056fbd 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -69,19 +69,16 @@ int trans_release(void) return(0); } -int needs_transaction(void) +int needs_root(void) { - if(config->op != PM_OP_MAIN && config->op != PM_OP_QUERY && config->op != PM_OP_DEPTEST) { - if((config->op == PM_OP_SYNC && !config->op_s_sync && - (config->op_s_search || config->group || config->op_q_list || config->op_q_info)) - || config->op == PM_OP_DEPTEST) { - /* special case: PM_OP_SYNC can be used w/ config->op_s_search by any user */ - return(0); - } else { - return(1); - } + if(config->op == PM_OP_UPGRADE || config->op == PM_OP_REMOVE || /* -U, -R */ + (config->op == PM_OP_SYNC && (config->op_s_clean || config->op_s_sync || /* -Sc, -Sy */ + (!config->group && !config->op_s_info && !config->op_q_list /* all other -S combinations, where */ + && !config->op_s_search && !config->op_s_printuris)))) { /* -g, -i, -l, -s, -p is not set */ + return(1); + } else { + return(0); } - return(0); } /* gets the current screen column width */ diff --git a/src/pacman/util.h b/src/pacman/util.h index 6416858..b159018 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -38,7 +38,7 @@ int trans_init(pmtranstype_t type, pmtransflag_t flags); int trans_release(void); -int needs_transaction(void); +int needs_root(void); int getcols(void); int makepath(const char *path); int rmrf(const char *path); -- 1.6.3.1

1 0

Re: [pacman-dev] [arch-general] "pkgdyn" a set of scripts for analysis of ELF deps in pkgs.
by Aaron Griffin 15 May '09

15 May '09

On Thu, Apr 23, 2009 at 10:45 PM, Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> wrote: > Hi, > > This is a set of draft scripts that I use to find/extract some data of > ELF files from packages. > For example: > > * Find all packages that needed inexistent shared objects because a > soname bump in libraries. > * Generate a report for all packages per repo that in case of soname > bump , needs to be rebuild. > * Find ELF files that are outside the allowed paths (for example ELF in > /usr/share) > * Find RPATH in packages, with a simple "awk" can generate a report etc. > > * Other task with "temporary data generated", but there are no scripts > at this time, are only "at command line runtime". > Can be easily construct with awk, of your preferer lang. > > It use files in analysis so, if a ELF needed a "soname" that are > symlink, this are reported (tho only case here are courier-maildrop, > just ignore it) > > http://archlinux.djgera.com.ar/pkgdyn/ > > Sample data and generated DB by "dynup.bash" is uploaded, extract in > "pkgdyn" directory. > The dyunp.bash can make DB from empty DB, or update the DB, deleting old > entries and inserting news. > > > Is in "public domain": so use it, modify it, copy it, no problem. > Sugestions, improvements, dudes, write me. > > > PS1: Exception here: (this report as missing, but is a "optdepend in > community") > extra/gnome-speech-0.4.25-1:NEEDED libespeak.so.1 > > PS2: All missing deps I already reported and many of [community] have > been fixed. Congrats TU! > > > Cheers, Just replying so I can send this over to the pacman-dev list. This looks great

2 2

[pacman-dev] [PATCH] Introduce -Suu
by Nagy Gabor 14 May '09

14 May '09

>From 449d53df4a41f3856a5dba967e2eb186aa64914a Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu, 14 May 2009 18:25:16 +0200 Subject: [PATCH] Introduce -Suu If the user switches from unstable repo to a stable one, it is quite hard to sync its system with the new repo (the user will see many "Local is newer than stable" messages, nothing more). That's why I introduced -Suu, which treats a sync package like an upgrade, iff the package version doesn't match with the local one's. I added a new pactest (sync104.py) to test this, and I updated the documentation of -Su. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.8.txt | 5 ++++- lib/libalpm/alpm.h | 2 +- lib/libalpm/sync.c | 18 +++++++++++++++--- lib/libalpm/sync.h | 2 +- lib/libalpm/trans.c | 4 ++-- pactest/tests/sync104.py | 12 ++++++++++++ src/pacman/pacman.c | 3 ++- src/pacman/sync.c | 2 +- 8 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 pactest/tests/sync104.py diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 4582be5..e914ab4 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -310,7 +310,10 @@ linkman:pacman.conf[5]. report of all packages to upgrade will be presented and the operation will not proceed without user confirmation. Dependencies are automatically resolved at this level and will be installed/upgraded if - necessary. + necessary. Pass this option twice to enable package downgrade; in this + case pacman will select sync packages whose version does not match with + the local ones'. For example, this can be useful when the user + switches from a testing repo to a stable one. *-w, \--downloadonly*:: Retrieve all packages from the server, but do not install/upgrade diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 57ea880..2a6c2e0 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -395,7 +395,7 @@ alpm_list_t * alpm_trans_get_pkgs(); int alpm_trans_init(pmtranstype_t type, pmtransflag_t flags, alpm_trans_cb_event cb_event, alpm_trans_cb_conv conv, alpm_trans_cb_progress cb_progress); -int alpm_trans_sysupgrade(void); +int alpm_trans_sysupgrade(int enable_downgrade); int alpm_trans_addtarget(char *target); int alpm_trans_prepare(alpm_list_t **data); int alpm_trans_commit(alpm_list_t **data); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index abda147..ccd6424 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -79,7 +79,7 @@ pmpkg_t SYMEXPORT *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync) return(NULL); } -int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync) +int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, int enable_downgrade) { alpm_list_t *i, *j, *k; @@ -115,8 +115,20 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s trans->packages = alpm_list_add(trans->packages, spkg); } } else if(cmp < 0) { - _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"), - lpkg->name, lpkg->version, sdb->treename, spkg->version); + if(enable_downgrade) { + /* check IgnorePkg/IgnoreGroup */ + if(_alpm_pkg_should_ignore(spkg) || _alpm_pkg_should_ignore(lpkg)) { + _alpm_log(PM_LOG_WARNING, _("%s: ignoring package downgrade (%s => %s)\n"), + lpkg->name, lpkg->version, spkg->version); + } else { + _alpm_log(PM_LOG_WARNING, _("%s: downgrading from version %s to version %s\n"), + lpkg->name, lpkg->version, spkg->version); + trans->packages = alpm_list_add(trans->packages, spkg); + } + } else { + _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"), + lpkg->name, lpkg->version, sdb->treename, spkg->version); + } } break; /* jump to next local package */ } else { /* 2. search for replacers in sdb */ diff --git a/lib/libalpm/sync.h b/lib/libalpm/sync.h index 00985b6..8171e36 100644 --- a/lib/libalpm/sync.h +++ b/lib/libalpm/sync.h @@ -23,7 +23,7 @@ #include "alpm.h" -int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync); +int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, int enable_downgrade); int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, char *name); int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, alpm_list_t **data); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index ef56841..b144b2a 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -87,7 +87,7 @@ int SYMEXPORT alpm_trans_init(pmtranstype_t type, pmtransflag_t flags, /** Search for packages to upgrade and add them to the transaction. * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -int SYMEXPORT alpm_trans_sysupgrade() +int SYMEXPORT alpm_trans_sysupgrade(int enable_downgrade) { pmtrans_t *trans; @@ -100,7 +100,7 @@ int SYMEXPORT alpm_trans_sysupgrade() ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1)); ASSERT(trans->type == PM_TRANS_TYPE_SYNC, RET_ERR(PM_ERR_TRANS_TYPE, -1)); - return(_alpm_sync_sysupgrade(trans, handle->db_local, handle->dbs_sync)); + return(_alpm_sync_sysupgrade(trans, handle->db_local, handle->dbs_sync, enable_downgrade)); } /** Add a target to the transaction. diff --git a/pactest/tests/sync104.py b/pactest/tests/sync104.py new file mode 100644 index 0000000..6d51b85 --- /dev/null +++ b/pactest/tests/sync104.py @@ -0,0 +1,12 @@ +self.description = "-Suu" + +sp = pmpkg("dummy", "0.9-1") +lp = pmpkg("dummy", "1.0-1") + +self.addpkg2db("sync", sp) +self.addpkg2db("local", lp) + +self.args = "-Suu" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=dummy|0.9-1") diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 72a72ba..6e2d96c 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -129,6 +129,7 @@ static void usage(int op, const char * const myname) printf(_(" -p, --print-uris print out URIs for given packages and their dependencies\n")); printf(_(" -s, --search <regex> search remote repositories for matching strings\n")); printf(_(" -u, --sysupgrade upgrade all packages that are out of date\n")); + printf(_(" (-uu enables package downgrade)\n")); printf(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); printf(_(" -y, --refresh download fresh package databases from the server\n")); printf(_(" --needed don't reinstall up to date packages\n")); @@ -501,7 +502,7 @@ static int parseargs(int argc, char *argv[]) config->op_q_unrequired = 1; break; case 'u': - config->op_s_upgrade = 1; + (config->op_s_upgrade)++; config->op_q_upgrade = 1; config->flags |= PM_TRANS_FLAG_UNNEEDED; break; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 68fb81a..3a03b42 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -561,7 +561,7 @@ static int sync_trans(alpm_list_t *targets) if(config->op_s_upgrade) { printf(_(":: Starting full system upgrade...\n")); alpm_logaction("starting full system upgrade\n"); - if(alpm_trans_sysupgrade() == -1) { + if(alpm_trans_sysupgrade(config->op_s_upgrade >= 2) == -1) { pm_fprintf(stderr, PM_LOG_ERROR, "%s\n", alpm_strerrorlast()); retval = 1; goto cleanup; -- 1.6.0.3

1 1

[pacman-dev] [PATCH] Don't print "local/" with -Qs
by Nagy Gabor 13 May '09

13 May '09

>From 1572535efe01dfae1f28b74862dec21f2102f165 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 10 May 2009 14:08:04 +0200 Subject: [PATCH] Don't print "local/" with -Qs See FS#14642. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- src/pacman/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 0d48638..2cb86a9 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -166,7 +166,7 @@ static int query_search(alpm_list_t *targets) pmpkg_t *pkg = alpm_list_getdata(i); if (!config->quiet) { - printf("local/%s %s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); + printf("%s %s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); } else { printf("%s", alpm_pkg_get_name(pkg)); } -- 1.6.0.3

3 4

[pacman-dev] [PATCH] Add more files to cleanup in autoclean.sh
by Gerardo Exequiel Pozzi 12 May '09

12 May '09

Add files pactest/tests/Makefile.in , pactest/tests/Makefile and contrib/Makefile.in , contrib/Makefile to list of cleanup script. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- autoclean.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/autoclean.sh b/autoclean.sh index 17e4416..4353179 100755 --- a/autoclean.sh +++ b/autoclean.sh @@ -18,7 +18,8 @@ rm -rf scripts/{Makefile.in,Makefile} rm -rf etc/{Makefile.in,Makefile} rm -rf etc/pacman.d/{Makefile.in,Makefile} rm -rf etc/abs/{Makefile.in,Makefile} -rm -rf pactest/{Makefile.in,Makefile} +rm -rf pactest{,/tests}/{Makefile.in,Makefile} +rm -rf contrib/{Makefile.in,Makefile} rm -rf doc/{Makefile.in,Makefile} rm -rf doc/html/*.html rm -rf doc/man3/*.3 -- 1.6.3

1 0

[pacman-dev] [PATCH] Introduce -Qlq
by Nagy Gabor 12 May '09

12 May '09

>From 054eae27537989dee76a06fac882fb38702144d5 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 10 May 2009 22:41:29 +0200 Subject: [PATCH] Introduce -Qlq With --quiet flag, -Ql doesn't print the package name only lists files. I made --quiet documentation up-to-date (I also added -Sgq/-Qgq). Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.8.txt | 18 ++++++++++++------ src/pacman/package.c | 8 ++++++-- src/pacman/package.h | 2 +- src/pacman/query.c | 2 +- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 95880a2..cc3d396 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -204,9 +204,13 @@ Query Options[[QO]] This is useful in combination with '\--info' and '\--list'. *-q, \--quiet*:: - Show less information for certain query operations. Search will only show - package names and not version, group, and description information; a bare - query will only show package names rather than names and versions. + Show less information for certain query operations. (This is useful when + pacman's output is processed in a script.) Search will only show package + names and not version, group, and description information; owns will + only show package names and versions instead of "file is owned by pkg" + messages; group will only show package names and omit group names; list + will only show files and omit package names; a bare query will only + show package names rather than names and versions. *-s, \--search* <'regexp'>:: This will search each locally-installed package for names or @@ -284,9 +288,11 @@ linkman:pacman.conf[5]. downloaded at a later time, using a program like wget. *-q, \--quiet*:: - Show less information for certain sync operations. Search will only show - package names and not version, group, and description information; list - will only show package names and omit databases and versions. + Show less information for certain sync operations. (This is useful when + pacman's output is processed in a script.) Search will only show package + names and not repo, version, group, and description information; list + will only show package names and omit databases and versions; group will + only show package names and omit group names. *-s, \--search* <'regexp'>:: This will search each package in the sync databases for names or diff --git a/src/pacman/package.c b/src/pacman/package.c index b23c577..da2feb5 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -205,7 +205,7 @@ void dump_pkg_backups(pmpkg_t *pkg) /* List all files contained in a package */ -void dump_pkg_files(pmpkg_t *pkg) +void dump_pkg_files(pmpkg_t *pkg, int quiet) { const char *pkgname, *root, *filestr; alpm_list_t *i, *pkgfiles; @@ -216,7 +216,11 @@ void dump_pkg_files(pmpkg_t *pkg) for(i = pkgfiles; i; i = alpm_list_next(i)) { filestr = alpm_list_getdata(i); - fprintf(stdout, "%s %s%s\n", pkgname, root, filestr); + if(!quiet){ + fprintf(stdout, "%s %s%s\n", pkgname, root, filestr); + } else { + fprintf(stdout, "%s%s\n", root, filestr); + } } fflush(stdout); diff --git a/src/pacman/package.h b/src/pacman/package.h index 14bc7d6..aede2a1 100644 --- a/src/pacman/package.h +++ b/src/pacman/package.h @@ -25,7 +25,7 @@ void dump_pkg_full(pmpkg_t *pkg, int level); void dump_pkg_sync(pmpkg_t *pkg, const char *treename); void dump_pkg_backups(pmpkg_t *pkg); -void dump_pkg_files(pmpkg_t *pkg); +void dump_pkg_files(pmpkg_t *pkg, int quiet); void dump_pkg_changelog(pmpkg_t *pkg); #endif /* _PM_PACKAGE_H */ diff --git a/src/pacman/query.c b/src/pacman/query.c index 2cb86a9..0b8406d 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -320,7 +320,7 @@ static void display(pmpkg_t *pkg) } } if(config->op_q_list) { - dump_pkg_files(pkg); + dump_pkg_files(pkg, config->quiet); } if(config->op_q_changelog) { dump_pkg_changelog(pkg); -- 1.6.0.3

2 3

[pacman-dev] [PATCH 1/3] Fix stderr redirection
by Cedric Staniewski 12 May '09

12 May '09

When redirecting both stderr and stdout and using the 2>&1 construct, you have to redirect stdout first. Otherwise stderr will be redirected to the 'old' stdout and not to the new resource. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- acinclude.m4 | 4 ++-- scripts/repo-add.sh.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 1524a3d..94ddb2b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -234,7 +234,7 @@ AC_DEFUN([_LT_COMPILER_BOILERPLATE], [AC_REQUIRE([LT_AC_PROG_SED])dnl ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +eval "$ac_compile" >/dev/null 2>&1 | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ])# _LT_COMPILER_BOILERPLATE @@ -248,7 +248,7 @@ AC_DEFUN([_LT_LINKER_BOILERPLATE], [AC_REQUIRE([LT_AC_PROG_SED])dnl ac_outfile=conftest.$ac_objext echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +eval "$ac_link" >/dev/null 2>&1 | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* ])# _LT_LINKER_BOILERPLATE diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 2390a92..13097df 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -341,7 +341,7 @@ add() fi pkgfile=$1 - if ! bsdtar -tf "$pkgfile" .PKGINFO 2>&1 >/dev/null; then + if ! bsdtar -tf "$pkgfile" .PKGINFO >/dev/null 2>&1; then error "$(gettext "'%s' is not a package file, skipping")" "$pkgfile" return 1 fi -- 1.6.3

1 0

[pacman-dev] [PATCH] Remove unused included headers from testdb.c and testpkg.c
by Gerardo Exequiel Pozzi 12 May '09

12 May '09

libgen.h was used for basename() in function main() from src/util/testdb.c string.h was used for strlen() in function output_cb() from src/util/testpkg.c Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- src/util/testdb.c | 1 - src/util/testpkg.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/util/testdb.c b/src/util/testdb.c index cbff578..abbc62f 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -24,7 +24,6 @@ #include <limits.h> #include <string.h> #include <dirent.h> -#include <libgen.h> #include <alpm.h> #include <alpm_list.h> diff --git a/src/util/testpkg.c b/src/util/testpkg.c index 6e8f9d1..d86fb1e 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -21,7 +21,6 @@ #include <stdio.h> /* printf */ #include <stdarg.h> /* va_list */ -#include <string.h> /* strlen */ #include <alpm.h> -- 1.6.2.4

1 0

[pacman-dev] [PATCH] makepkg: Document package splitting
by Allan McRae 12 May '09

12 May '09

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This should cover all suggested changes so far. Any further clarifications needed? doc/PKGBUILD.5.txt | 27 +++++++++++++++++++++------ doc/makepkg.8.txt | 6 +++--- scripts/makepkg.sh.in | 2 +- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index e1ea632..41c468e 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -238,19 +238,14 @@ use during the build and install process. These three variables are as follows: *startdir*:: This contains the absolute path to the directory where the PKGBUILD was located, which is usually the output of `$(pwd)` when makepkg is started. - `$startdir` was most often used in combination with `/src` or `/pkg` - postfixes, but use of the `$srcdir` and `$pkgdir` variables is preferred. *srcdir*:: This points to the directory where makepkg extracts or copies all source - files. Although it currently is an alias for `$startdir/src`, this - assumption should not be assumed true for all future revisions of makepkg. + files. *pkgdir*:: This points to the directory where makepkg bundles the installed package (this directory will become the root directory of your built package). - Although it currently is an alias for `$startdir/pkg`, this assumption - should not be assumed true for all future revisions of makepkg. If you create any variables of your own in the build function, it is recommended to use the bash `local` keyword to scope the variable to inside @@ -264,6 +259,26 @@ combination with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakero usage will be limited to running the packaging stage. The build() function will be run as the user calling makepkg. +Package Splitting +----------------- +makepkg supports building multiple packages from a single PKGBUILD. This is achieved +by assigning an array of package names to the `pkgname` directive. Each split package +uses a corresponding packaging function with name `package_foo()`, where `foo` is the +name of the split package. + +All options and directives for the split packages default to the global values given +within the PKGBUILD. However, some of these can be overridden within each split +package's packaging function. The following variables can be overridden: `pkgdesc`, +`license`, `groups`, `depends`, `optdepends`, `provides`, `conflicts`, `replaces`, +`backup`, `options` and `install`. + +An optional global directive is available when building a split package: + +*pkgbase*:: + The name used to refer to the group of packages in the output of makepkg + and in the naming of source-only tarballs. If not specified, the first + element in the `pkgname` array is used. + Install/Upgrade/Remove Scripting -------------------------------- Pacman has the ability to store and execute a package-specific script when it diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index fb2e805..e480d8e 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -122,9 +122,9 @@ Options during dependency auto-resolution and installation when using `-s`. *-R, \--repackage*:: - Repackage contents of pkg/ without rebuilding the package. This is - useful if you forgot a depend or install file in your PKGBUILD and the - build itself will not change. + Repackage contents of the package without rebuilding the package. This + is useful if you forgot a depend or install file in your PKGBUILD and + the build itself will not change. *-s, \--syncdeps*:: Install missing dependencies using pacman. When build-time or run-time diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ebc19bc..fefcc73 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1308,7 +1308,7 @@ usage() { printf "$(gettext " -p <buildscript> Use an alternate build script (instead of '%s')")\n" "$BUILDSCRIPT" echo "$(gettext " -r, --rmdeps Remove installed dependencies after a successful build")" # fix flyspray feature request #2978 - echo "$(gettext " -R, --repackage Repackage contents of pkg/ without building")" + echo "$(gettext " -R, --repackage Repackage contents of the package without rebuilding")" echo "$(gettext " -s, --syncdeps Install missing dependencies with pacman")" echo "$(gettext " --allsource Generate a source-only tarball including downloaded sources")" echo "$(gettext " --asroot Allow makepkg to run as root user")" -- 1.6.3

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-148-g2001735
by dan＠archlinux.org 12 May '09

12 May '09

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 20017354f7ccb58bf4f78691985a5d237f4dbc90 (commit) via a783f3fbf1425fc9b8815a2ab658aa6530ce0c23 (commit) via f569c4a0425649853516634853159cbe8815dee6 (commit) via ed848b1c54e520db760760f1db2e79414cf39bf6 (commit) from c27904661ef96cb2e7c729ce82b527146529c768 (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 20017354f7ccb58bf4f78691985a5d237f4dbc90 Author: Dan McGee <dan(a)archlinux.org> Date: Mon May 11 21:43:36 2009 -0500 Remove version information from -Qqo output This was the only --quiet operation that showed version information; make it consistent with the rest. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a783f3fbf1425fc9b8815a2ab658aa6530ce0c23 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun May 10 22:41:29 2009 +0200 Introduce -Qlq With --quiet flag, -Ql doesn't print the package name, just lists the files. I made --quiet documentation up-to-date (I also added -Sgq/-Qgq). Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f569c4a0425649853516634853159cbe8815dee6 Author: Allan McRae <allan(a)archlinux.org> Date: Sun May 3 17:21:02 2009 +1000 makepkg: several small fixes 1) Do not attempt to strip compressed binaries Original-work-by: Marc - A. Dahlhaus <mad(a)wol.de> 2) Add "\" in "GPL\'ed" so quote mark does not break source code highlighting 3) Add local to docdir paths in makepkg.conf for consistency 4) Use full path to sed in MacOSX in case users have GNU sed earlier in path Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ed848b1c54e520db760760f1db2e79414cf39bf6 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Mon May 11 00:35:56 2009 -0300 Fix non-C style comments in libalpm Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- doc/pacman.8.txt | 18 ++++++++++++------ etc/makepkg.conf.in | 2 +- lib/libalpm/be_files.c | 4 ++-- lib/libalpm/be_package.c | 2 +- scripts/makepkg.sh.in | 4 +++- src/pacman/package.c | 8 ++++++-- src/pacman/package.h | 2 +- src/pacman/query.c | 5 ++--- 9 files changed, 29 insertions(+), 18 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: Document package splitting
by Allan McRae 12 May '09

12 May '09

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is a RFC patch. I would like comments on the documentation I have written. I find it hard to write documentation for features I implemented as I know what I am talking about, even if no-one else does... (I haven't actually checked that the docs still build after these changes.) doc/PKGBUILD.5.txt | 19 +++++++++++++++++++ doc/makepkg.8.txt | 6 +++--- scripts/makepkg.sh.in | 2 +- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index e1ea632..e2f19ac 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -264,6 +264,25 @@ combination with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakero usage will be limited to running the packaging stage. The build() function will be run as the user calling makepkg. +Package Splitting +----------------- +makepkg supports building multiple packages from a single PKGBUILD. This is achieved +by assigning an array of package names to the `pkgname` directive. Each sub-package +uses a corresponding package function with name `package_foo()`, where `foo` is the +name of the package. + +All options and directives for the split packages default to the global values given +within the PKGBUILD. However, some of these can be overridden within each sub-package's +package function. The following variables can be overridden: `pkgdesc`, `license`, +`groups`, `depends`, `optdepends`, `provides`, `conflicts`, `replaces`, `backup`, +`options` and `install`. + +An additional directive is available when building a split package: + +*pkgbase*:: + The name used to refer to the group of packages in the output of makepkg. + Also, used when creating source-only tarballs. + Install/Upgrade/Remove Scripting -------------------------------- Pacman has the ability to store and execute a package-specific script when it diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index fb2e805..e480d8e 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -122,9 +122,9 @@ Options during dependency auto-resolution and installation when using `-s`. *-R, \--repackage*:: - Repackage contents of pkg/ without rebuilding the package. This is - useful if you forgot a depend or install file in your PKGBUILD and the - build itself will not change. + Repackage contents of the package without rebuilding the package. This + is useful if you forgot a depend or install file in your PKGBUILD and + the build itself will not change. *-s, \--syncdeps*:: Install missing dependencies using pacman. When build-time or run-time diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ebc19bc..fefcc73 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1308,7 +1308,7 @@ usage() { printf "$(gettext " -p <buildscript> Use an alternate build script (instead of '%s')")\n" "$BUILDSCRIPT" echo "$(gettext " -r, --rmdeps Remove installed dependencies after a successful build")" # fix flyspray feature request #2978 - echo "$(gettext " -R, --repackage Repackage contents of pkg/ without building")" + echo "$(gettext " -R, --repackage Repackage contents of the package without rebuilding")" echo "$(gettext " -s, --syncdeps Install missing dependencies with pacman")" echo "$(gettext " --allsource Generate a source-only tarball including downloaded sources")" echo "$(gettext " --asroot Allow makepkg to run as root user")" -- 1.6.3

3 4

[pacman-dev] [PATCH] Fix extra commas at end of enumerator list in alpm.h
by Gerardo Exequiel Pozzi 12 May '09

12 May '09

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- lib/libalpm/alpm.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 48b6ba2..b34563e 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -357,7 +357,7 @@ typedef enum _pmtransevt_t { /** Files will be downloaded from a repository. * The repository's tree name is passed to the callback. */ - PM_TRANS_EVT_RETRIEVE_START, + PM_TRANS_EVT_RETRIEVE_START } pmtransevt_t; /*@}*/ @@ -368,7 +368,7 @@ typedef enum _pmtransconv_t { PM_TRANS_CONV_CONFLICT_PKG = 0x04, PM_TRANS_CONV_CORRUPTED_PKG = 0x08, PM_TRANS_CONV_LOCAL_NEWER = 0x10, - PM_TRANS_CONV_REMOVE_PKGS = 0x20, + PM_TRANS_CONV_REMOVE_PKGS = 0x20 } pmtransconv_t; /* Transaction Progress */ -- 1.6.2.4

2 2

[pacman-dev] [PATCH] Fix non-C style comments in libalpm
by Gerardo Exequiel Pozzi 12 May '09

12 May '09

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- lib/libalpm/be_files.c | 4 ++-- lib/libalpm/be_package.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 8ac253a..9bb7b3d 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -489,7 +489,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) char first = tolower(line[0]); if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; //initialize to null incase of failure + struct tm tmp_tm = {0}; /* initialize to null in case of failure */ setlocale(LC_TIME, "C"); strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); info->builddate = mktime(&tmp_tm); @@ -505,7 +505,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) char first = tolower(line[0]); if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; //initialize to null incase of failure + struct tm tmp_tm = {0}; /* initialize to null in case of failure */ setlocale(LC_TIME, "C"); strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); info->installdate = mktime(&tmp_tm); diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index c0ec3bc..bcb742c 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -83,7 +83,7 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg) } else if(!strcmp(key, "builddate")) { char first = tolower(ptr[0]); if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; //initialize to null in case of failure + struct tm tmp_tm = {0}; /* initialize to null in case of failure */ setlocale(LC_TIME, "C"); strptime(ptr, "%a %b %e %H:%M:%S %Y", &tmp_tm); newpkg->builddate = mktime(&tmp_tm); -- 1.6.2.4

2 1

[pacman-dev] [PATCH] New feature: files verification
by changaco 04 May '09

04 May '09

>From 7c0348fa499f55968764fef4c7bb3d3d7245932b Mon Sep 17 00:00:00 2001 From: Charly COSTE <changaco(a)laposte.net> Date: Sat, 28 Mar 2009 12:36:23 +0100 Subject: [PATCH] New feature: files verification A new option "-Qy" which checks if the files owned by a/some/all package(s) really are on the system (i.e. not accidentally deleted). http://bugs.archlinux.org/task/13877 Signed-off-by: Charly COSTE <changaco(a)laposte.net> --- src/pacman/conf.h | 1 + src/pacman/pacman.c | 6 +++- src/pacman/query.c | 87 +++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 84 insertions(+), 10 deletions(-) diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 466d983..01a1828 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -50,6 +50,7 @@ typedef struct __config_t { unsigned short op_q_search; unsigned short op_q_changelog; unsigned short op_q_upgrade; + unsigned short op_q_verify; unsigned short op_s_clean; unsigned short op_s_downloadonly; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 59916d6..e1d13a4 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -360,6 +360,7 @@ static int parseargs(int argc, char *argv[]) {"verbose", no_argument, 0, 'v'}, {"downloadonly", no_argument, 0, 'w'}, {"refresh", no_argument, 0, 'y'}, + {"verify", no_argument, 0, 'y'}, {"noconfirm", no_argument, 0, 1000}, {"config", required_argument, 0, 1001}, {"ignore", required_argument, 0, 1002}, @@ -510,7 +511,10 @@ static int parseargs(int argc, char *argv[]) config->flags |= PM_TRANS_FLAG_DOWNLOADONLY; config->flags |= PM_TRANS_FLAG_NOCONFLICTS; break; - case 'y': (config->op_s_sync)++; break; + case 'y': + (config->op_s_sync)++; + config->op_q_verify = 1; + break; case '?': return(1); default: return(1); } diff --git a/src/pacman/query.c b/src/pacman/query.c index 0d48638..2a7dba5 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -334,10 +334,70 @@ static void display(pmpkg_t *pkg) } } +// We loop through the packages and for each packages we loop through files to check if they exist +static void verify(alpm_list_t *pkgs) +{ + alpm_list_t *i, *files, *file, *pkgs2repair; + pmpkg_t *pkg; + struct stat stFileInfo; + int pkgs_n = alpm_list_count(pkgs); + int j = 0, k = 0; + for(i = pkgs; i; i = alpm_list_next(i)) { + j++; + pkg = alpm_list_getdata(i); + char *pkgname = alpm_pkg_get_name(pkg); + if(filter(pkg)) { + files = alpm_pkg_get_files(pkg); + for(file = files; file; file = alpm_list_next(file)){ + char *x = alpm_list_getdata(file); + char *f = malloc (strlen(x)+2); + strcpy(f,"/"); + strcat(f, x); + k++; + if(strncmp(f, "/tmp", 4)==0){ + continue; // ignore files in /tmp + } + if(lstat(f,&stFileInfo) == 0) { // we use lstat to prevent errors from symbolic links + if(!config->quiet){ + fprintf(stderr, "\rfile n°%i (package %i/%i): OK", k, j, pkgs_n); fflush(stdout); + } + } + else { + if(config->quiet){ + fprintf(stderr, "%s %s\n", pkgname, f); fflush(stdout); + } else { + fprintf(stderr, "\rfile n°%i (package %i/%i): Missing file owned by \"%s\": %s\n", k, j, pkgs_n, pkgname, f); fflush(stdout); + } + if(alpm_list_find_ptr(pkgs2repair, pkgname) == NULL) { + pkgs2repair = alpm_list_add(pkgs2repair, pkgname); + } + } + } + } + } + if(!config->quiet){ + fprintf(stderr, "\n"); + } + if(alpm_list_count(pkgs2repair) > 0) { + if(!config->quiet){ + fprintf(stderr, "Damaged packages: "); + } + for(i = pkgs2repair; i; i = alpm_list_next(i)) { + fprintf(stdout, "%s ", alpm_list_getdata(i)); + } + } else { + if(!config->quiet){ + fprintf(stderr, "No damaged packages."); + } + } + fprintf(stdout, "\n"); + fflush(stdout); +} + int pacman_query(alpm_list_t *targets) { int ret = 0; - alpm_list_t *i; + alpm_list_t *i, *pkgs; /* First: operations that do not require targets */ @@ -363,18 +423,20 @@ int pacman_query(alpm_list_t *targets) } /* operations on all packages in the local DB - * valid: no-op (plain -Q), list, info + * valid: no-op (plain -Q), list, info, verify * invalid: isfile, owns */ if(targets == NULL) { if(config->op_q_isfile || config->op_q_owns) { pm_printf(PM_LOG_ERROR, _("no targets specified (use -h for help)\n")); return(1); - } - - for(i = alpm_db_get_pkgcache(db_local); i; i = alpm_list_next(i)) { - pmpkg_t *pkg = alpm_list_getdata(i); - if(filter(pkg)) { - display(pkg); + } else if(config->op_q_verify) { + verify(alpm_db_get_pkgcache(db_local)); + } else { + for(i = alpm_db_get_pkgcache(db_local); i; i = alpm_list_next(i)) { + pmpkg_t *pkg = alpm_list_getdata(i); + if(filter(pkg)) { + display(pkg); + } } } return(0); @@ -389,7 +451,7 @@ int pacman_query(alpm_list_t *targets) } /* operations on named packages in the local DB - * valid: no-op (plain -Q), list, info */ + * valid: no-op (plain -Q), list, info, verify */ for(i = targets; i; i = alpm_list_next(i)) { char *strname = alpm_list_getdata(i); pmpkg_t *pkg = NULL; @@ -406,8 +468,12 @@ int pacman_query(alpm_list_t *targets) continue; } + if(filter(pkg)) { display(pkg); + if(config->op_q_verify){ + pkgs = alpm_list_add(pkgs, pkg); + } } if(config->op_q_isfile) { @@ -415,6 +481,9 @@ int pacman_query(alpm_list_t *targets) pkg = NULL; } } + if(config->op_q_verify){ + verify(pkgs); + } return(ret); } -- 1.6.2.1 Créez votre adresse électronique prenom.nom(a)laposte.net 1 Go d'espace de stockage, anti-spam et anti-virus intégrés.

7 21