- Pacman-dev - lists.archlinux.org

[pacman-dev] slovak translation for pacman
by Jozef Riha 27 Jul '10

27 Jul '10

attached. cheers, jose

2 3

[pacman-dev] [PATCH] Use the plural features of gettext
by Dan McGee 27 Jul '10

27 Jul '10

Gettext has this whole 'Plural-Form' thing that until now we haven't taken advantage of. Given that not all languages have the same plural form rules as English, take advantage of it by defining a new _n() macro which will normally define to ngettext(), and adjust a few messages as an example of how to use. There are surely other places where we do singular/plural logic without me having noticed, so further patches are welcome to fix those up too. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/callback.c | 13 +++++++++---- src/pacman/query.c | 6 ++++-- src/pacman/util.h | 2 ++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 23804d7..3696d3c 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -283,11 +283,16 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, namelist = alpm_list_add(namelist, (char *)alpm_pkg_get_name(i->data)); } - printf(_(":: the following package(s) cannot be upgraded due to " - "unresolvable dependencies:\n")); + printf(_n( + ":: The following package cannot be upgraded due to unresolvable dependencies:\n", + ":: The following packages cannot be upgraded due to unresolvable dependencies:\n", + alpm_list_count(namelist))); list_display(" ", namelist); - *response = noyes(_("\nDo you want to skip the above " - "package(s) for this upgrade?")); + printf("\n"); + *response = noyes(_n( + "Do you want to skip the above package for this upgrade?", + "Do you want to skip the above packages for this upgrade?", + alpm_list_count(namelist))); alpm_list_free(namelist); } break; diff --git a/src/pacman/query.c b/src/pacman/query.c index 7f064f2..5538e81 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -406,8 +406,10 @@ static int check(pmpkg_t *pkg) } if(!config->quiet) { - printf(_("%s: %d total files, %d missing file(s)\n"), - pkgname, allfiles, errors); + printf(_n("%s: %d total file, ", "%s: %d total files, ", allfiles), + pkgname, allfiles); + printf(_n("%d missing file\n", "%d missing files\n", errors), + errors); } return(errors != 0 ? 1 : 0); diff --git a/src/pacman/util.h b/src/pacman/util.h index bbf4382..d85ba7b 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -30,8 +30,10 @@ #include <libintl.h> /* here so it doesn't need to be included elsewhere */ /* define _() as shortcut for gettext() */ #define _(str) gettext(str) +#define _n(str1, str2, ct) ngettext(str1, str2, ct) #else #define _(str) str +#define _n(str1, str2, ct) (ct == 1 ? str1 : str2) #endif /* update speed for the fill_progress based functions */ -- 1.7.2

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.0-24-g0d6efb3
by dan＠archlinux.org 27 Jul '10

27 Jul '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 0d6efb35ce445747cdc37b4f58cdf63463de6e1a (commit) via 52118bf0f084e891b53bcf05f9e6021ebb26fb13 (commit) via ff689b6a383cbeb5ea699d587fe8975d71cae600 (commit) via fa4f25626c462e88ca0f6457bf9942980a5bd329 (commit) via f8d7cd6b2623a864aa85fbdcdd629f3ff92a631c (commit) via e702f56ea671c6cd1154a0ddb41fa63e97587c85 (commit) via 7f5c486666cc99fba4029b2c059ae062b7dd7933 (commit) from fcb4f0264f2b8e0a6ed1e7eebfe00f662ba94ef2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion | 4 ++-- lib/libalpm/po/kk.po | 2 +- lib/libalpm/sync.c | 18 +++++++++++------- scripts/makepkg.sh.in | 6 +++--- src/pacman/util.c | 1 + test/pacman/tests/sync022.py | 25 +++++++++++++++++++++++++ test/pacman/tests/sync023.py | 29 +++++++++++++++++++++++++++++ 7 files changed, 72 insertions(+), 13 deletions(-) create mode 100644 test/pacman/tests/sync022.py create mode 100644 test/pacman/tests/sync023.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.0-56-gddc4130
by dan＠archlinux.org 27 Jul '10

27 Jul '10

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 ddc4130c978decc5b2498b24d3b20e0c4efbc3cf (commit) via 0d6efb35ce445747cdc37b4f58cdf63463de6e1a (commit) via 52118bf0f084e891b53bcf05f9e6021ebb26fb13 (commit) via ff689b6a383cbeb5ea699d587fe8975d71cae600 (commit) via fa4f25626c462e88ca0f6457bf9942980a5bd329 (commit) via f8d7cd6b2623a864aa85fbdcdd629f3ff92a631c (commit) via e702f56ea671c6cd1154a0ddb41fa63e97587c85 (commit) via 7f5c486666cc99fba4029b2c059ae062b7dd7933 (commit) from a83559949622992faafb628b742893891ead8390 (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 ddc4130c978decc5b2498b24d3b20e0c4efbc3cf Merge: a835599 0d6efb3 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 27 10:18:35 2010 -0500 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion | 4 ++-- lib/libalpm/po/kk.po | 2 +- lib/libalpm/sync.c | 18 +++++++++++------- scripts/makepkg.sh.in | 6 +++--- src/pacman/util.c | 1 + test/pacman/tests/sync022.py | 25 +++++++++++++++++++++++++ test/pacman/tests/sync023.py | 29 +++++++++++++++++++++++++++++ 7 files changed, 72 insertions(+), 13 deletions(-) create mode 100644 test/pacman/tests/sync022.py create mode 100644 test/pacman/tests/sync023.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 4/4] Add INTERRUPTED to transaction hooks support.
by Victor Lowther 27 Jul '10

27 Jul '10

If a transaction is interrupted, the hooks need to know so that they can roll back anything that needs to be rolled back. --- lib/libalpm/trans.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index ed26aa6..d212f50 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -235,6 +235,7 @@ int SYMEXPORT alpm_trans_interrupt() RET_ERR(PM_ERR_TRANS_TYPE, -1)); trans->state = STATE_INTERRUPTED; + alpm_hook_transact("INTERRUPTED"); return(0); } -- 1.7.1.1

1 0

[pacman-dev] [PATCH 3/4] Add a PKGBUILD for easy testing.
by Victor Lowther 27 Jul '10

27 Jul '10

We don't need the whole usual pkgbuild, but having one in the git tree sure makes testing simpler. --- PKGBUILD | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..16cf977 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 83376 2010-06-21 12:52:09Z dan $ +# Maintainer: Aaron Griffin <aaron(a)archlinux.org> +# Maintainer: Dan McGee <dan(a)archlinux.org> + +pkgname=pacman-git +pkgver=$(date +%s) +pkgrel=$(git log --pretty=format:%h |head -n 1) +pkgdesc="A library-based package manager with dependency support" +arch=('i686' 'x86_64') +url="http://www.archlinux.org/pacman/" +license=('GPL') +groups=('base') +depends=('bash' 'libarchive>=2.7.1' 'libfetch>=2.25' 'pacman-mirrorlist') +makedepends=('asciidoc') +optdepends=('fakeroot: for makepkg usage as normal user') +provides=('pacman=9999') +backup=('etc/pacman.conf' 'etc/makepkg.conf') +conflicts=('pacman') +options=(!libtool) + +build() { + cd .. + ./autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-doc + make || return 1 +} + +package() { + cd $srcdir/.. + srcdir="$PWD" + make DESTDIR=$pkgdir install || return 1 + + # install Arch specific stuff + mkdir -p $pkgdir/etc + # set things correctly in the default conf file + case "$CARCH" in + i686) + mycarch="i686" + mychost="i686-pc-linux-gnu" + myflags="-march=i686 " + ;; + x86_64) + mycarch="x86_64" + mychost="x86_64-unknown-linux-gnu" + myflags="-march=x86-64 " + ;; + esac + sed -i $pkgdir/etc/makepkg.conf \ + -e "s|@CARCH[@]|$mycarch|g" \ + -e "s|@CHOST[@]|$mychost|g" \ + -e "s|@CARCHFLAGS[@]|$myflags|g" + + # install completion files + mkdir -p $pkgdir/etc/bash_completion.d/ + install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman + mkdir -p $pkgdir/usr/share/zsh/site-functions/ + install -m644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman +} + +# vim: set ts=2 sw=2 et: -- 1.7.1.1

1 0

[pacman-dev] [PATCH 2/4] Add very basic transaction hooks to alpm.
by Victor Lowther 27 Jul '10

27 Jul '10

libalpm compliant programs now support running pre-commit and post-commit hooks. Currently, the implementation is as simple as I can make it -- if /etc/pacman.d/hooks.d/transact.sh exists, it will be run with the 'pre-commit' parameter just before a transaction is committed, and it will be run with 'post-commit' after the transaction has been completed. The intent is for transact.sh to be a wrapper that calls scripts in /etc/pacman.d/hooks.d/transact.d with the arg it is passed, but since this is just for a demo I did not actually include any of that. I also didn't bother adhering to any of the coding standards, as that will be easy enough to fix up once we have something a bit more fleshed out. --- lib/libalpm/hooks.c | 28 ++++++++++++++++++++++++++++ lib/libalpm/hooks.h | 4 ++++ lib/libalpm/trans.c | 4 +++- 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/hooks.c b/lib/libalpm/hooks.c index 9630c70..5982ea5 100644 --- a/lib/libalpm/hooks.c +++ b/lib/libalpm/hooks.c @@ -30,6 +30,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/statvfs.h> +#include <sys/wait.h> #include <errno.h> /* libalpm */ @@ -46,3 +47,30 @@ #include "alpm.h" #include "deps.h" #include "cache.h" + +int alpm_hook_transact(char* phase) { + char filename[PATH_MAX]; + struct stat sbuf; + pid_t childpid, retpid; + int status; + /* ignore transaction hooks when targeting another root filesystem + if (!strcmp(handle->root,"/")) + return 1;*/ + snprintf(filename,PATH_MAX,"%s/transact.sh",ALPM_HOOKS_DIR); + /* if we cannot stat transact.sh, just return */ + if (stat(filename,&sbuf) != 0) + return 1; + fflush(NULL); + childpid=fork(); + if (childpid == -1) { + return 1; + } else if (childpid == 0) { + execl(filename,"transact.sh",phase,(char *)0); + } else { + /* return the exit status of the transact.sh program. */ + do { + retpid = waitpid(childpid,&status,0); + } while (!WIFEXITED(status) && !WIFSIGNALED(status)); + } + return !WEXITSTATUS(status); +} diff --git a/lib/libalpm/hooks.h b/lib/libalpm/hooks.h index d60b1f4..f79d2c4 100644 --- a/lib/libalpm/hooks.h +++ b/lib/libalpm/hooks.h @@ -25,4 +25,8 @@ #include "alpm.h" +#define ALPM_HOOKS_DIR "/etc/pacman.d/hooks.d" + +int alpm_hook_transact(char*); + #endif /*ALPM_HOOKS_H */ diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 523f33b..ed26aa6 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -195,7 +195,8 @@ int SYMEXPORT alpm_trans_commit(alpm_list_t **data) if(trans->add == NULL && trans->remove == NULL) { return(0); } - + if (! alpm_hook_transact("pre-commit")) + return (-1); trans->state = STATE_COMMITING; if(trans->add == NULL) { @@ -211,6 +212,7 @@ int SYMEXPORT alpm_trans_commit(alpm_list_t **data) } trans->state = STATE_COMMITED; + alpm_hook_transact("post-commit"); return(0); } -- 1.7.1.1

1 0

[pacman-dev] [PATCH 1/4] Add skeleton for hooks support
by Victor Lowther 27 Jul '10

27 Jul '10

This begins work on adding some sort of hook infrastructure to pacman. There has been much discussion and little code that I have seen, so I figured I would go ahead an implement a very basic skeleton for transaction hooks support. --- lib/libalpm/Makefile.am | 1 + lib/libalpm/{sync.h => hooks.c} | 34 +++++++++++++++++++++++++--------- lib/libalpm/{add.h => hooks.h} | 19 ++++++++----------- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 3473a73..b4fdadf 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -44,6 +44,7 @@ libalpm_la_SOURCES = \ sync.h sync.c \ trans.h trans.c \ util.h util.c \ + hooks.h hooks.c \ version.c libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO) diff --git a/lib/libalpm/sync.h b/lib/libalpm/hooks.c similarity index 65% copy from lib/libalpm/sync.h copy to lib/libalpm/hooks.c index 000a09c..9630c70 100644 --- a/lib/libalpm/sync.h +++ b/lib/libalpm/hooks.c @@ -1,9 +1,10 @@ /* - * sync.h + * hooks.c * * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> + * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> * Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos(a)frugalware.org> * * This program is free software; you can redistribute it and/or modify @@ -19,14 +20,29 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _ALPM_SYNC_H -#define _ALPM_SYNC_H -#include "alpm.h" - -int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, alpm_list_t **data); -int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data); +#include "config.h" -#endif /* _ALPM_SYNC_H */ +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/statvfs.h> +#include <errno.h> -/* vim: set ts=2 sw=2 noet: */ +/* libalpm */ +#include "hooks.h" +#include "trans.h" +#include "alpm_list.h" +#include "package.h" +#include "util.h" +#include "log.h" +#include "handle.h" +#include "add.h" +#include "remove.h" +#include "sync.h" +#include "alpm.h" +#include "deps.h" +#include "cache.h" diff --git a/lib/libalpm/add.h b/lib/libalpm/hooks.h similarity index 73% copy from lib/libalpm/add.h copy to lib/libalpm/hooks.h index eb37dc7..d60b1f4 100644 --- a/lib/libalpm/add.h +++ b/lib/libalpm/hooks.h @@ -1,8 +1,11 @@ /* - * add.h + * hooks.h * * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> + * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> + * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> + * Copyright (c) 2006 by Miklos Vajna <vmiklos(a)frugalware.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 @@ -17,15 +20,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _ALPM_ADD_H -#define _ALPM_ADD_H +#ifndef _ALPM_HOOKS_H +#define _ALPM_HOOKS_H -#include "db.h" -#include "alpm_list.h" -#include "trans.h" +#include "alpm.h" -int _alpm_upgrade_packages(pmtrans_t *trans, pmdb_t *db); - -#endif /* _ALPM_ADD_H */ - -/* vim: set ts=2 sw=2 noet: */ +#endif /*ALPM_HOOKS_H */ -- 1.7.1.1

1 0

Re: [pacman-dev] New patchset for package signing
by Denis A. Altoé Falqueto 26 Jul '10

26 Jul '10

On Thu, Jul 22, 2010 at 12:17 AM, Denis A. Altoé Falqueto <denisfalqueto(a)gmail.com> wrote: > Guys, > > The previous patches were not much commented. I believe the main problem was > the fact that I didn't use gpgme (and, instead, undone some work already done). > > So, I changed the code to use gpgme. Here are the patches for your evaluation. Hi, Now that ArchCon has ended, I believe we can continue with the discussion, right? The replies are rare, so I don't know if there is not enough interest or if my implementation is so bad that can't be fixed :) I am open to any constructive criticism and suggestions, as always. -- A: Because it obfuscates the reading. Q: Why is top posting so bad? ------------------------------------------- Denis A. Altoe Falqueto -------------------------------------------

2 2

[pacman-dev] [PATCH] bash_completion: negate expression inside brackets
by Dave Reisner 26 Jul '10

26 Jul '10

Avoids letting the shell evaluate ! as something else (e.g. an alias). Signed-off-by: Dave Reisner <d(a)falconindy.com> --- contrib/bash_completion | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/bash_completion b/contrib/bash_completion index 1ec2cd5..bdc4754 100644 --- a/contrib/bash_completion +++ b/contrib/bash_completion @@ -75,8 +75,8 @@ _pacman() { if [[ $? != 0 ]]; then _arch_ptr2comp core - elif ! [[ $prev =~ ^-\w*[Vbhr] || - $prev = --@(cachedir|config|dbpath|help|logfile|root|version) ]] + elif [[ ! $prev =~ ^-\w*[Vbhr] && + ! $prev = --@(cachedir|config|dbpath|help|logfile|root|version) ]] then [[ $cur = -* ]] && _arch_ptr2comp ${o#* } common || case ${o% *} in -- 1.7.2

1 0