[X2go-Commits] buildscripts.git - master (branch) updated: d409c118b3c69f94a720029dc9df78c749d2f818

[X2go dev team]

The branch, master has been updated
       via  d409c118b3c69f94a720029dc9df78c749d2f818 (commit)
       via  17f11aac0ed5a9627cd2a3982baf6de1dc9494e9 (commit)
       via  737f94d78580811542e71e03bfe0aad7e4fde2be (commit)
       via  a3ee29310eb8c10a42a44a3c5634acd5523d554c (commit)
       via  bf07fb7ee2e03aab84c6eef45589ecfc144a0c36 (commit)
       via  6157051bb4f488c1667d1c4e3393b11989d7742e (commit)
       via  68869e06c22b3473571a13946ebe94213bf4ed86 (commit)
       via  2c869137d3018a7d237229cd66476cf1bb3b24a4 (commit)
       via  bdca3b40bca5d518e9c7921aab4930b0e3ec3faa (commit)
      from  bf9ebc577359da6d7ddff50f8f5a3fd9ec51cb1a (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 d409c118b3c69f94a720029dc9df78c749d2f818
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Dec 21 02:49:31 2011 +0100

    fix while loop + dupload

commit 17f11aac0ed5a9627cd2a3982baf6de1dc9494e9
Merge: 737f94d78580811542e71e03bfe0aad7e4fde2be bf9ebc577359da6d7ddff50f8f5a3fd9ec51cb1a
Author: NWT Administrator <nwt-admin at minobo.das-netzwerkteam.de>
Date:   Wed Dec 21 02:41:52 2011 +0100

    Merge branch 'master' of ssh://code.das-netzwerkteam.de:32032/~/git/buildscripts

commit 737f94d78580811542e71e03bfe0aad7e4fde2be
Merge: a3ee29310eb8c10a42a44a3c5634acd5523d554c d67f2370600a76b79f048317664f802cd594cd65
Author: NWT Administrator <nwt-admin at minobo.das-netzwerkteam.de>
Date:   Wed Dec 21 02:34:59 2011 +0100

    Merge branch 'master' of ssh://code.das-netzwerkteam.de:32032/~/git/buildscripts

commit a3ee29310eb8c10a42a44a3c5634acd5523d554c
Merge: bf07fb7ee2e03aab84c6eef45589ecfc144a0c36 fde062645a692b0b300be7c5960003f040465293
Author: NWT Administrator <nwt-admin at minobo.das-netzwerkteam.de>
Date:   Wed Dec 21 02:26:23 2011 +0100

    Merge branch 'master' of ssh://code.das-netzwerkteam.de:32032/~/git/buildscripts

commit bf07fb7ee2e03aab84c6eef45589ecfc144a0c36
Merge: 6157051bb4f488c1667d1c4e3393b11989d7742e 2696cdb736ab514d210f6126b7f2e66743cbdacd
Author: NWT Administrator <nwt-admin at minobo.das-netzwerkteam.de>
Date:   Wed Dec 21 02:20:22 2011 +0100

    Merge branch 'master' of ssh://code.das-netzwerkteam.de:32032/~/git/buildscripts

commit 6157051bb4f488c1667d1c4e3393b11989d7742e
Merge: 68869e06c22b3473571a13946ebe94213bf4ed86 10203a6d9f8c7b93ae9f06aa501ce984899c969f
Author: NWT Administrator <nwt-admin at minobo.das-netzwerkteam.de>
Date:   Wed Dec 21 02:14:19 2011 +0100

    Merge branch 'master' of ssh://code.das-netzwerkteam.de:32032/~/git/buildscripts

commit 68869e06c22b3473571a13946ebe94213bf4ed86
Merge: 2c869137d3018a7d237229cd66476cf1bb3b24a4 c6d3589c78b29966a6e029261c96578bc7d1921d
Author: NWT Administrator <nwt-admin at minobo.das-netzwerkteam.de>
Date:   Wed Dec 21 02:07:59 2011 +0100

    Merge branch 'master' of ssh://code.das-netzwerkteam.de:32032/~/git/buildscripts

commit 2c869137d3018a7d237229cd66476cf1bb3b24a4
Merge: bdca3b40bca5d518e9c7921aab4930b0e3ec3faa cdb45b8be9a37ad47f47e409a48f8f8b4cfd8bec
Author: NWT Administrator <nwt-admin at minobo.das-netzwerkteam.de>
Date:   Wed Dec 21 02:05:43 2011 +0100

    Merge branch 'master' of ssh://code.das-netzwerkteam.de:32032/~/git/buildscripts

commit bdca3b40bca5d518e9c7921aab4930b0e3ec3faa
Author: NWT Administrator <nwt-admin at minobo.das-netzwerkteam.de>
Date:   Wed Dec 21 02:04:57 2011 +0100

    fix for last commit

-----------------------------------------------------------------------

Summary of changes:
 bin/build-package |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/bin/build-package b/bin/build-package
index 0d3f007..7d7977f 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -240,7 +240,6 @@ build_packages() {
 
 upload_packages() {
 	# dupload the new packages to the reprepro repository
-	cd "$PKGDIST"
 	cat "$PROJECT_DIR/BUILDS_FOR" | egrep -v '(^$|^#.*$)' | while read line; do
 		l_DIST=$(echo ${line/: /:} | cut -d":" -f1 | tr [:upper:] [:lower:])
 		l_CODENAMES=${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | tr [:upper:] [:lower:])}
@@ -254,13 +253,13 @@ upload_packages() {
 				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
+					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 
 				cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_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
+				ls $PROJECT_*.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME $PROJECT_*.changes 0<&-
 			done
 		done
 	done


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).