[X2Go-Commits] [buildscripts] 05/05: fix update scripts for release builds

git-admin at x2go.org git-admin at x2go.org
Tue Jan 28 15:28:41 CET 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 2fc83c747ded932ce84ac0218a8cf19633ca0227
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jan 28 15:28:38 2014 +0100

    fix update scripts for release builds
---
 bin/updatebuildmain    |    2 +-
 bin/updatebuildrelease |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/updatebuildmain b/bin/updatebuildmain
index 5a46ea4..9106e0a 100755
--- a/bin/updatebuildmain
+++ b/bin/updatebuildmain
@@ -31,8 +31,8 @@ test -z $1 || test -d ./.git || {
 }
 
 # update the build-main branch with our newest blessed reference
-git branch -d build-main &>/dev/null || true
 git tag -d build-main &>/dev/null || true
+git branch -D build-main &>/dev/null || true
 git checkout -b build-main $REF || true
 git push $ORIGIN build-main:build-main
 git checkout master
diff --git a/bin/updatebuildrelease b/bin/updatebuildrelease
index c11c538..d5e5eb8 100755
--- a/bin/updatebuildrelease
+++ b/bin/updatebuildrelease
@@ -32,8 +32,8 @@ test -z $1 || test -d ./.git || {
 }
 
 # update the build-main branch with our newest blessed reference
-git branch -d build-$RELEASE &>/dev/null || true
 git tag -d build-$RELEASE &>/dev/null || true
+git branch -D build-$RELEASE &>/dev/null || true
 git checkout -b build-$RELEASE $REF || true
 git push $ORIGIN build-$RELEASE:build-$RELEASE
 git checkout master

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git



More information about the x2go-commits mailing list