The branch, master has been updated via 79f8ded19dc8d0b33a4a2377b399d650cb8560e5 (commit) via e8bc1d1c0ce82fca2c8b37abd9434f3733b7e310 (commit) from e89e49b94bc6c2c2fe47235097ef0a1f418ae92b (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 79f8ded19dc8d0b33a4a2377b399d650cb8560e5 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 30 02:53:15 2013 +0100 make FORCE_BUILD usable from outside the script commit e8bc1d1c0ce82fca2c8b37abd9434f3733b7e310 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 30 02:51:07 2013 +0100 make sure /home/mike/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games includes ~/bin ----------------------------------------------------------------------- Summary of changes: bin/build-deb-package | 8 ++++++-- bin/build-rpm-package | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/bin/build-deb-package b/bin/build-deb-package index ce6be3f..1a4c183 100755 --- a/bin/build-deb-package +++ b/bin/build-deb-package @@ -17,6 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +export PATH=~/bin:$PATH + GIT_USER="gituser" GIT_HOSTNAME="git.mydomain.org" @@ -38,6 +40,8 @@ REPOS_SERVER="packages.mydomain.org" PACKAGES_WITHOUT_OTHERMIRROR="keyring" GNUPGHOME=$HOME/.gnupg +FORCE_BUILD=${FORCE_BUILD:-"no"} + test -z $1 && { echo "usage: $(basename $0) [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit -1; } PREFIX=$(echo `basename $0` | cut -d"-" -f1) @@ -62,7 +66,7 @@ set_vars() { ARGV2_CODENAME="$(echo "$2/" | cut -d"/" -f2)" COMPONENT="${ARGV2_COMPONENT:-${COMPONENT:-$COMPONENT_NIGHTLY}}" CODENAMES="${ARGV2_CODENAME:-${CODENAMES}}" - [ -n "$ARGV2_CODENAME" ] && FORCE_BUILD=0 || FORCE_BUILD=-1 + [ -n "$ARGV2_CODENAME" ] && FORCE_BUILD="yes" || true DATE="${DATE:-$(date +%Y%m%d)}" if [ "x$COMPONENT" = "x$COMPONENT_MAIN" ]; then CHECKOUT="${3:-build-main}" @@ -315,7 +319,7 @@ upload_packages() { ### MAIN ### set_vars $@ && { if [ "x$(basename $0)" = "x$PREFIX-build-deb-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-deb-package" ]; then - cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" -eq 0 ] && { + cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" = "yes" ] && { prepare_workspace && { clear_pkgdist build_packages diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 8728222..a87e152 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -17,6 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +export PATH=~/bin:$PATH + GIT_USER="gituser" GIT_HOSTNAME="git.mydomain.org" @@ -39,6 +41,8 @@ REPOS_SERVER="packages.mydomain.org" PACKAGES_WITHOUT_OTHERMIRROR="keyring" GNUPGHOME=$HOME/.gnupg +FORCE_BUILD=${FORCE_BUILD:-"no"} + test -z $1 && { echo "usage: $(basename $0) [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit -1; } PREFIX=$(echo `basename $0` | cut -d"-" -f1) @@ -61,7 +65,7 @@ set_vars() { ARGV2_CODENAME="$(echo "$2/" | cut -d"/" -f2)" COMPONENT="${ARGV2_COMPONENT:-${COMPONENT:-$COMPONENT_NIGHTLY}}" CODENAMES="${ARGV2_CODENAME:-${CODENAMES}}" - [ -n "$ARGV2_CODENAME" ] && FORCE_BUILD=0 || FORCE_BUILD=-1 + [ -n "$ARGV2_CODENAME" ] && FORCE_BUILD="yes" || true DATE="${DATE:-$(date +%Y%m%d)}" if [ "x$COMPONENT" = "x$COMPONENT_MAIN" ]; then CHECKOUT="${3:-build-main}" @@ -264,7 +268,7 @@ upload_packages() { ### MAIN ### set_vars $@ && { if [ "x$(basename $0)" = "x$PREFIX-build-rpm-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-rpm-package" ]; then - cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" -eq 0 ] && { + cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" = "yes" ] && { prepare_workspace && { clear_pkgdist build_packages hooks/post-receive -- buildscripts.git (X2Go packaging scripts) 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" (X2Go packaging scripts).