January 2012 - Arch-projects - lists.archlinux.org

[arch-projects] [devtools] [PATCH] makechrootpkg: fix error message
by Allan McRae 01 Jan '12

01 Jan '12

Passing a directory that does not exist to makechrootpkg results in an error message: ==> ERROR: No chroot dir defined, or invalid path '' The path is not being printed as the readlink command blanks it if the directory does not exist. Fix this. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- makechrootpkg.in | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index c5d57e5..d385910 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -20,6 +20,7 @@ install_pkg= add_to_db=false run_namcap=false chrootdir= +passeddir= default_copy=$USER [[ -n $SUDO_USER ]] && default_copy=$SUDO_USER @@ -63,7 +64,7 @@ while getopts 'hcudr:I:l:n' arg; do c) clean_first=true ;; u) update_first=true ;; d) add_to_db=true ;; - r) chrootdir="$OPTARG" ;; + r) passeddir="$OPTARG" ;; I) install_pkg="$OPTARG" ;; l) copy="$OPTARG" ;; n) run_namcap=true ;; @@ -72,7 +73,7 @@ while getopts 'hcudr:I:l:n' arg; do done # Canonicalize chrootdir, getting rid of trailing / -chrootdir=$(readlink -e "$chrootdir") +chrootdir=$(readlink -e "$passeddir") if [[ ${copy:0:1} = / ]]; then copydir=$copy @@ -101,7 +102,7 @@ if [[ ! -f PKGBUILD && -z $install_pkg ]]; then fi if [[ ! -d $chrootdir ]]; then - die "No chroot dir defined, or invalid path '$chrootdir'" + die "No chroot dir defined, or invalid path '$passeddir'" fi if [[ ! -d $chrootdir/root ]]; then -- 1.7.8.1

1 0

[arch-projects] [devtools][PATCH] commitpkg: behavior more sanely in searching for built pkgs
by Dave Reisner 01 Jan '12

01 Jan '12

In the case of a .pkg.tar.xz and a .pkg.tar.gz existing in the same directory, all commitpkg would say is: ==> WARNING: Could not find . Skipping x86_64 Upon digging into the logic, we did a few things poorly, mostly in getpkgfile: - getpkgfile tried to die in a subshell (within the command substituion assignment to 'pkgfile'). This will never work. - We assumed that proper glob expansion happened when we received exactly 1 arg. This isn't necessarily true without nullglob in effect. - We dumped the real error (spewed by getpkgfile) to /dev/null. - We checked for the package twice in both $PWD and $DESTDIR/. - We checked for file existance multiple times. Address this by: - not hiding errors. revamp the wording a little bit to make it more obvious why we failed, particularly in the case of a glob expanding to more than 1 file. Logic here is simplified to pointing out the failure cases of 0 and >1. - setting nullglob so the number of arguments passed into getpkgfile is meaningful from a 'did it decisively resolve' point of view. - not trying to exit the entire script from a subshell. Just return a value (and use it). - avoiding the package file existance check afterwards. this is a freebie from getpkgfile when the glob passed fails to expand. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Apologies to those subscribed to arch-commits for uploading ed umpteen times... commitpkg.in | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/commitpkg.in b/commitpkg.in index c298256..9f31149 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -3,13 +3,19 @@ m4_include(lib/common.sh) getpkgfile() { - if [[ ${#} -ne 1 ]]; then - die 'No canonical package found!' - elif [[ ! -f $1 ]]; then - die "Package ${1} not found!" - fi + case $# in + 0) + error 'No canonical package found!' + return 1 + ;; + [!1]) + error 'Failed to canonicalize package name -- multiple packages found:' + msg2 '%s' "$@" + return 1 + ;; + esac - echo ${1} + echo "$1" } # Source makepkg.conf; fail if it is not found @@ -127,15 +133,9 @@ for _arch in ${arch[@]}; do for _pkgname in ${pkgname[@]}; do fullver=$(get_full_version $_pkgname) - pkgfile=$(getpkgfile "$_pkgname-$fullver-${_arch}".pkg.tar.?z 2>/dev/null) - pkgdestfile=$(getpkgfile "$PKGDEST/$_pkgname-$fullver-${_arch}".pkg.tar.?z 2>/dev/null) - if [[ -f $pkgfile ]]; then - pkgfile="./$pkgfile" - elif [[ -f $pkgdestfile ]]; then - pkgfile="$pkgdestfile" - else - warning "Could not find ${pkgfile}. Skipping ${_arch}" + if ! pkgfile=$(shopt -s nullglob; getpkgfile "$_pkgname-$fullver-${_arch}".pkg.tar.?z); then + warning "Skipping $_pkgname-$fullver-$_arch: failed to locate package file" skip_arches+=($_arch) continue 2 fi -- 1.7.8.1

1 2

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.01.1-2-g8862cb8
by tomegun＠archlinux.org 01 Jan '12

01 Jan '12

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 "Arch Linux initscripts repository". The branch, master has been updated via 8862cb89e8199b0fce807d26bfe7fd6a7d0ff623 (commit) from 5dd3a4eb3e5405641bf3e5eaeac07883efd64c5e (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 8862cb89e8199b0fce807d26bfe7fd6a7d0ff623 Author: Tom Gundersen <teg(a)jklm.no> Date: Sun Jan 1 13:11:43 2012 +0100 rc.conf: remove leftover comment People should refer to the manpage. Reported-by: Andrea Scarpino <andrea(a)archlinux.org> Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: rc.conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.01.1-1-g5dd3a4e
by tomegun＠archlinux.org 31 Dec '11

31 Dec '11

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 "Arch Linux initscripts repository". The branch, master has been updated via 5dd3a4eb3e5405641bf3e5eaeac07883efd64c5e (commit) from 6e62ab6a4346023674c7304cf05a5dfebdb265ba (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 5dd3a4eb3e5405641bf3e5eaeac07883efd64c5e Author: Tom Gundersen <teg(a)jklm.no> Date: Sun Jan 1 01:03:29 2012 +0100 timezone: correct check for when there is nothing to do We were unconditionally copying the zoneinfo file when we should be doing nothing. Reported-by: Leonid Isaev <lisaev(a)umail.iu.edu> Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: functions | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0