August 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: allow make-style environment var overrides
by Dave Reisner 05 Aug '13

05 Aug '13

This allows for VAR=value and VAR+=value variable declarations. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Similar to the RFC I sent but with the addition of support for appending, not just overriding (as make allows as well). doc/makepkg.8.txt | 2 +- scripts/makepkg.sh.in | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 899858e..512f8ed 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -11,7 +11,7 @@ makepkg - package build utility Synopsis -------- -'makepkg' [options] +'makepkg' [options] [ENVVAR=value] [ENVVAR+=value] ... Description diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a2d0d7d..59013f6 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2624,6 +2624,16 @@ while true; do shift done +# attempt to consume any extra argv as environment variables. this supports +# overriding (e.g. CC=clang) as well as overriding (e.g. CFLAGS+=' -g'). +extra_environment=() +while [[ $1 ]]; do + if [[ $1 = ?(_[[:alpha:]])+([[:alnum:]_])?(+)=* ]]; then + extra_environment+=("$1") + fi + shift +done + # setup signal traps trap 'clean_up' 0 for signal in TERM HUP QUIT; do @@ -2706,6 +2716,11 @@ if [[ ! -w $BUILDDIR ]]; then exit 1 fi +# override settings from extra variables on commandline, if any +if (( ${#extra_environment[*]} )); then + export "${extra_environment[@]}" +fi + PKGDEST=${_PKGDEST:-$PKGDEST} PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined if (( ! (NOBUILD || GENINTEG) )) && [[ ! -w $PKGDEST ]]; then -- 1.8.3.4

4 6

[pacman-dev] [PATCH] check.c: break backup file search loop after match
by Andrew Gregory 05 Aug '13

05 Aug '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/check.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/check.c b/src/pacman/check.c index 6c8889f..f9166b0 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -327,11 +327,11 @@ int check_pkg_full(alpm_pkg_t *pkg) for(lp = alpm_pkg_get_backup(pkg); lp; lp = lp->next) { alpm_backup_t *bl = lp->data; if(strcmp(path, bl->name) == 0) { backup = 1; - continue; + break; } } if(type != AE_IFDIR) { /* file or symbolic link */ -- 1.8.3.4

2 1

[pacman-dev] [PATCH v2 1/9] pacdiff: Search and give warnings for older pacsave.[0-9]* files
by Jonathan Frazier 03 Aug '13

03 Aug '13

Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> --- contrib/pacdiff.sh.in | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index 47779d6..5ce6140 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -25,6 +25,7 @@ diffprog=${DIFFPROG:-vimdiff} diffsearchpath=${DIFFSEARCHPATH:-/etc} locate=0 USE_COLOR='y' +declare -a oldsaves m4_include(../scripts/library/output_format.sh) @@ -47,9 +48,9 @@ version() { cmd() { if [ $locate -eq 1 ]; then - locate -0 -e -b \*.pacnew \*.pacorig \*.pacsave + locate -0 -e -b \*.pacnew \*.pacorig \*.pacsave '*.pacsave.[0-9]*' else - find $diffsearchpath $ -name \*.pacnew -o -name \*.pacorig -o -name \*.pacsave $ -print0 + find $diffsearchpath $ -name \*.pacnew -o -name \*.pacorig -o -name \*.pacsave -o -name '*.pacsave.[0-9]*' $ -print0 fi } @@ -71,6 +72,12 @@ while IFS= read -u 3 -r -d '' pacfile; do file="${pacfile%.pac*}" file_type="pac${pacfile##*.pac}" + # add matches for pacsave.N to oldsaves array, do not prompt + if [[ $file_type = pacsave.+([0-9]) ]]; then + oldsaves+=("$pacfile") + continue + fi + msg "%s file found for %s" "$file_type" "$file" if [ ! -f "$file" ]; then warning "$file does not exist" @@ -97,6 +104,8 @@ while IFS= read -u 3 -r -d '' pacfile; do fi done 3< <(cmd) +(( ${#oldsaves[@]} )) && warning "Ignoring %s" "${oldsaves[@]}" + exit 0 # vim: set ts=2 sw=2 noet: -- 1.8.3.2

4 12