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

X2go dev team git-admin at x2go.org
Mon Jul 4 15:39:55 CEST 2011


The branch, master has been updated
       via  53dc690bf2d0e8abd15e34cef3c4a181778d2306 (commit)
      from  b08d45e3794cb76270ba289fe2e73d1d73dec772 (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 53dc690bf2d0e8abd15e34cef3c4a181778d2306
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 4 15:40:15 2011 +0200

    fix for last commit

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

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

The diff of changes is:
diff --git a/bin/x2go-build-package b/bin/x2go-build-package
index 3cb6100..07090a8 100755
--- a/bin/x2go-build-package
+++ b/bin/x2go-build-package
@@ -106,8 +106,8 @@ prepare_workspace() {
 
 	if [ -d $PROJECT_DIR/.git ]; then 
 		cd $PROJECT_DIR && git reset --hard
+		git checkout $CHECKOUT || git checkout -b $CHECKOUT
 		git pull origin $CHECKOUT
-		git checkout origin $CHECKOUT || git checkout -b $CHECKOUT
 	else
 		cd $(dirname $PROJECT_DIR)
 		git clone git://code.x2go.org/$PROJECT.git


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




More information about the x2go-commits mailing list