June 2010 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] repo-add: try symlink, then hardlink, then copy for DB file
by Dan McGee 24 Jun '10

24 Jun '10

We were seeing some issues when trying to create our new database alias using symlinks on certain filesystems (see FS#19907). Have a fallback method in place where we first try a symlink, then a hard link, then just copy the database if all else fails. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/repo-add.sh.in | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 7bde600..2838f81 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -487,7 +487,10 @@ if (( success )); then [[ -f $REPO_DB_FILE ]] && mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old" [[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE" - ln -sf "$REPO_DB_FILE" "${REPO_DB_FILE%.tar.*}" + dblink="${REPO_DB_FILE%.tar.*}" + ln -sf "$REPO_DB_FILE" "$dblink" 2>/dev/null || \ + ln -f "$REPO_DB_FILE" "$dblink" 2>/dev/null || \ + cp "$REPO_DB_FILE" "$dblink" else msg "$(gettext "No packages modified, nothing to do.")" exit 1 -- 1.7.1

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.0-29-g630e750
by dan＠archlinux.org 24 Jun '10

24 Jun '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 630e7508ee44f2c41ba3f5d17c0c9ac15b15af3b (commit) via 71330a431040377ae9a37989fcfd43cee7596194 (commit) via c6a94a8d2204cfdec0f782f647903d597b4faf57 (commit) via 6f4f9c1b66ed859b3679d70e15c003ab4907b823 (commit) via 07a9effdd06345d09f09cdc92e23c937d8fa94b5 (commit) via 708f186f98a0c2094225aa94ac8a139ac3a9163e (commit) via 226c137245192444085d03a7f841b35afe99791c (commit) via 2222e9f8dfe6e149262f629571b3432718351d3f (commit) from 67d71ea932a18d27dbb87f4f364ae9159b4edc96 (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 630e7508ee44f2c41ba3f5d17c0c9ac15b15af3b Merge: 71330a4 6f4f9c1 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 24 08:32:33 2010 -0500 Merge branch 'maint' commit 71330a431040377ae9a37989fcfd43cee7596194 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Wed Jun 23 01:35:56 2010 -0400 makepkg: Place source packages symlinks in build dir when SRCPKGDEST is used Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c6a94a8d2204cfdec0f782f647903d597b4faf57 Author: Andres P <aepd87(a)gmail.com> Date: Mon Jun 21 12:25:37 2010 -0430 makepkg: fix regression in split package function checking Commit 13748ca0529 inversed the nature of one test wherein the if clause would throw a fatal error if a legitimate package function was defined in PKGBUILD. Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion | 17 ++++++++++++----- scripts/makepkg.sh.in | 24 +++++++++++++++++++----- scripts/rankmirrors.sh.in | 12 ++++++------ 3 files changed, 37 insertions(+), 16 deletions(-) hooks/post-receive -- The official pacman repository

1 0

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

24 Jun '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 6f4f9c1b66ed859b3679d70e15c003ab4907b823 (commit) via 07a9effdd06345d09f09cdc92e23c937d8fa94b5 (commit) via 708f186f98a0c2094225aa94ac8a139ac3a9163e (commit) via 226c137245192444085d03a7f841b35afe99791c (commit) via 2222e9f8dfe6e149262f629571b3432718351d3f (commit) from c2cf6a14cf44400d0ef249b38d37eb04d3424bf4 (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 | 17 ++++++++++++----- scripts/makepkg.sh.in | 10 +++++++--- scripts/rankmirrors.sh.in | 12 ++++++------ 3 files changed, 25 insertions(+), 14 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: Place source packages symlinks in build dir when SRCPKGDEST is used
by Eric Bélanger 23 Jun '10

23 Jun '10

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- scripts/makepkg.sh.in | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index dbc4047..0219015 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -153,7 +153,7 @@ clean_up() { # clean up dangling symlinks to packages for pkg in ${pkgname[@]}; do - for file in ${pkg}-*-*-${CARCH}${PKGEXT}; do + for file in ${pkg}-*-*-${CARCH}${PKGEXT} ${pkg}-*-*-${CARCH}${SRCEXT}; do if [[ -h $file && ! -e $file ]]; then rm -f $file fi @@ -1126,6 +1126,16 @@ create_srcpackage() { error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi + + if (( ! ret )) && [[ "$SRCPKGDEST" != "${startdir}" ]]; then + ln -sf "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}" + ret=$? + fi + + if (( ret )); then + warning "$(gettext "Failed to create symlink to source package file.")" + fi + cd "${startdir}" rm -rf "${srclinks}" } -- 1.7.1

2 1

[pacman-dev] [PATCH] makepkg: Place source packages symlinks in build dir when SRCPKGDEST is used
by Eric Bélanger 23 Jun '10

23 Jun '10

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- scripts/makepkg.sh.in | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index dbc4047..83d656f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -159,6 +159,16 @@ clean_up() { fi done done + + # clean up dangling symlinks to source packages + for pkg in ${pkgname[@]}; do + for file in ${pkg}-*-*-${CARCH}${SRCEXT}; do + if [[ -h $file && ! -e $file ]]; then + rm -f $file + fi + done + done + fi fi @@ -1126,6 +1136,16 @@ create_srcpackage() { error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi + + if (( ! ret )) && [[ "$SRCPKGDEST" != "${startdir}" ]]; then + ln -sf "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}" + ret=$? + fi + + if (( ret )); then + warning "$(gettext "Failed to create symlink to source package file.")" + fi + cd "${startdir}" rm -rf "${srclinks}" } -- 1.7.1

2 2

[pacman-dev] [PATCH] makepkg: prevent error trap activation in bash-3.2
by Allan McRae 23 Jun '10

23 Jun '10

Running "pacman -T foo" is expected to return a non-zero value when "foo" is not installed. This sets of the error trap in bash-3.2 but not bash 4.x. Work around this by disabling the error trap around this pacman call as we are manually checking the return value anyway. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4f9f89b..2699f63 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -382,11 +382,15 @@ run_pacman() { } check_deps() { - (( $# > 0 )) || return + (( $# > 0 )) || return 0 + # Disable error trap in pacman subshell call as this breaks bash-3.2 compatibility + # Also, a non-zero return value is not unexpected and we are manually dealing them + set +E local ret=0 - pmout=$(run_pacman -T "$@") - ret=$? + pmout=$(run_pacman -T "$@") || ret=$? + set -E + if (( ret == 127 )); then #unresolved deps echo "$pmout" elif (( ret )); then -- 1.7.1

2 2

[pacman-dev] pacman shell scripts and bash3.2 compat - Was: [PATCH 04/11] makepkg: less code duplication in create_package
by Andres P 23 Jun '10

23 Jun '10

On Sun, Jun 20, 2010 at 6:09 AM, Allan McRae <allan(a)archlinux.org> wrote: > That is a bash4 command so will break cygwin compatibility (which currently > has bash-3.2). Resubmit with something like "tr [:lower:] [:upper:]" usage. > > (I know the ${i^^} is used elsewhere, but that slipped passed my notice and > will be being reverted. > bash_completion also has bash 4 only items... Please write a style guide for all shell scripts.... Andres P

2 3

[pacman-dev] [PATCH 1/3] rankmirror: pipe errors to stderr
by Andres P 23 Jun '10

23 Jun '10

If this is to be scripted with AIF or another tool, it needs to respect stderr. Signed-off-by: Andres P <aepd87(a)gmail.com> --- scripts/rankmirrors.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/rankmirrors.sh.in b/scripts/rankmirrors.sh.in index 9b4e973..283fb46 100644 --- a/scripts/rankmirrors.sh.in +++ b/scripts/rankmirrors.sh.in @@ -49,7 +49,7 @@ version() { } err() { - echo "$1" + echo "$1" >&2 exit 1 } -- 1.7.1

3 6

Re: [pacman-dev] [arch-dev-public] Pacman Architecture option (was: [signoff] pacman 3.4.0-2)
by Dan McGee 22 Jun '10

22 Jun '10

On Tue, Jun 22, 2010 at 10:55 AM, Thomas Bächler <thomas(a)archlinux.org> wrote: > Am 22.06.2010 17:42, schrieb Dan McGee: >> This is the last thing I will say on this. Where the heck were you >> guys 11 months ago? Surely not following development, but you want to >> piss about it now. >> >> Discussion: >> http://mailman.archlinux.org/pipermail/pacman-dev/2009-July/008965.html >> http://mailman.archlinux.org/pipermail/pacman-dev/2009-July/008968.html >> http://mailman.archlinux.org/pipermail/pacman-dev/2009-July/008970.html >> >> Patches (with no feedback, mind you): >> http://mailman.archlinux.org/pipermail/pacman-dev/2009-August/009193.html > > I do read pacman-dev on occasion, but not regularly, and I don't follow > each patch thread or new feature. I heard that the Architecture option > was coming, but was never too concerned with the details (just random > happiness about it) - I didn't even know it would be an option, but > thought it was just default behaviour. > I even discussed the issue with Xavier I think, maybe it was Allan, it's > too long ago. > > If you read my emails, you will see that I did not complain a single > time, but rather wanted to know what the reasoning behind this decision > was (which I'd still like to know btw). OK, I lied about no more replies becuase I did forget to put this in my original email- the primary driving reason from my point of view is "If you do nothing, nothing changes". e.g. for anyone not adding this to their pacman.conf, they won't have to worry about this feature getting in the way. With that said, I do realize this would not inhibet most people to be turned on by default, but I think we saw this as a precautionary measure rather than something we should force on people. I've CC-ed to pacman-dev; if I end up being in the minority on this then I'll take a patch to make the default be "auto" (and we will then need to add an explicit "none" option and document it). > And while I think that this should be changed to the way I suggested > (which would be a trivial change), for the reasons I posted, I can live > with it either way.

2 1

[pacman-dev] bash-3 only error trap activation
by Allan McRae 22 Jun '10

22 Jun '10

Hi, When running makepkg in bash-3.2 I am getting a couple of error trap activations that we do not get in bash-4.1. Here is the problem area: check_deps() { (( $# > 0 )) || return <- HERE local ret=0 pmout=$(run_pacman -T "$@") <- HERE ret=$? The first one gets set off anytime "depends" or "makedepends" are empty and can be fixed by using "|| return 0", but the second is doing my head in... Of course, turning off the error trap around those commands makes it work, and that may be an OK approach given we are dealing with all error states below that. If you want a bash-3.2 package to test grab one from http://allanmcrae.com/packages/bash3-3.2.051-1.src.tar.gz . Test on a PKGBUILD with unsatisfied dependencies. Allan

2 7