The branch, master has been updated via c7aa2e7bdfdceb1130ad420798b28ca1717b537c (commit) via f0e5ce61c28180c380dc3921423aa9ea3ec9c02c (commit) from eca903fceb335913fa641b30cdf7973daa4ee93a (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 c7aa2e7bdfdceb1130ad420798b28ca1717b537c Merge: f0e5ce61c28180c380dc3921423aa9ea3ec9c02c eca903fceb335913fa641b30cdf7973daa4ee93a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 18 22:14:03 2012 +0100 Merge branch 'master' of ssh://code.x2go.org:32032/~/git/buildscripts commit f0e5ce61c28180c380dc3921423aa9ea3ec9c02c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 18 22:08:52 2012 +0100 more SKIP_ARCH areas in code adapted ----------------------------------------------------------------------- Summary of changes: bin/build-package | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/bin/build-package b/bin/build-package index 5acf585..9c5c109 100755 --- a/bin/build-package +++ b/bin/build-package @@ -126,14 +126,16 @@ clear_pkgdist() { if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then for l_ARCH in amd64 i386; do - mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH" - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/dupload.conf" - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.changes - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.upload - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.build - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.dsc - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.tar.gz - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/"*.deb + [ "x$SKIP_ARCH" != "x$l_ARCH" ] { + mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH" + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/dupload.conf" + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.changes + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.upload + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.build + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.dsc + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.tar.gz + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/"*.deb + } done fi for l_EXTRA_ARCH in $EXTRA_ARCHS; do @@ -251,10 +253,12 @@ upload_packages() { test -z $CODENAMES || echo $line | grep $CODENAMES || break if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then - for l_ARCH in amd64 i386; do - cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH" - test -f ./dupload.conf || ln -s ~/.dupload.conf.$PREFIX ./dupload.conf - ls $PROJECT_*.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME $PROJECT_*.changes 0<&- + for l_ARCH in amd64 i386; do + [ "x$SKIP_ARCH" != "x$l_ARCH" ] { + cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH" + test -f ./dupload.conf || ln -s ~/.dupload.conf.$PREFIX ./dupload.conf + ls $PROJECT_*.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME $PROJECT_*.changes 0<&- + } done fi for l_EXTRA_ARCH in $EXTRA_ARCHS; do hooks/post-receive -- buildscripts.git (buildscripts upstream project) 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 "buildscripts.git" (buildscripts upstream project).