buildscripts.git - master (branch) updated: 1d27752bd12d2f7985462e7a135ec8d3211ac19a - x2go-commits

21 Sep 2011

The branch, master has been updated
       via  1d27752bd12d2f7985462e7a135ec8d3211ac19a (commit)
       via  7cc493c6859a79e285aed81f2fe522da8515281d (commit)
      from  466363a51a5d2eba9d190269d384cc92212ae941 (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 1d27752bd12d2f7985462e7a135ec8d3211ac19a
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Thu Sep 22 01:23:04 2011 +0200

    include x2goadmincenter in nightly build chain

commit 7cc493c6859a79e285aed81f2fe522da8515281d
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Thu Sep 22 01:23:00 2011 +0200

    fix for x2go-updatebuildmain script

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

Summary of changes:
 bin/x2go-build-all-packages |    1 +
 bin/x2go-updatebuildmain    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

The diff of changes is:

diff --git a/bin/x2go-build-all-packages b/bin/x2go-build-all-packages
index f5e2d6f..19c84ae 100755
--- a/bin/x2go-build-all-packages
+++ b/bin/x2go-build-all-packages
@@ -39,6 +39,7 @@ x2goclient heuler master\n
 nxproxy heuler master\n
 cups-x2go heuler master\n
 x2godesktopsharing heuler master\n
+x2goadmincenter heuler master\n
 x2gognomebindings heuler master\n
 x2golxdebindings heuler master\n
 x2goplasmabindings heuler master\n
diff --git a/bin/x2go-updatebuildmain b/bin/x2go-updatebuildmain
index ad37da0..3716ed4 100755
--- a/bin/x2go-updatebuildmain
+++ b/bin/x2go-updatebuildmain
@@ -30,5 +30,5 @@ test -z $1 || test -d ./.git || {
 }
 
 # update the build-main branch with our newest blessed reference
-git pull --all
+git branch build-main &>/dev/null || true
 git push origin $REF:build-main


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

    