[X2Go-Commits] buildscripts.git - master (branch) updated: 616592fafcf45338b7de037ad86f5f4a2ebc8a79

X2Go dev team git-admin at x2go.org
Sat Nov 30 21:02:00 CET 2013


The branch, master has been updated
       via  616592fafcf45338b7de037ad86f5f4a2ebc8a79 (commit)
      from  98940a3a6fbeffa94548f314b3996ddbcbc129f5 (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 616592fafcf45338b7de037ad86f5f4a2ebc8a79
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 30 21:01:26 2013 +0100

    fix check for empty string

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

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

The diff of changes is:
diff --git a/bin/build-deb-package b/bin/build-deb-package
index 7de31fd..392e335 100755
--- a/bin/build-deb-package
+++ b/bin/build-deb-package
@@ -120,7 +120,8 @@ prepare_workspace() {
 	cd "$PROJECT_DIR"
 
 	# by default we build for all current debian versions
-	if [ -n $ARGV2_CODENAME ]; then
+	echo "HIIIIIIEEEEEERR: $ARGV2_CODENAME"
+	if [ "x$ARGV2_CODENAME" != "x" ]; then
 		if echo "$DEBIAN_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then
 			DEB_BUILD_FOR="debian:$ARGV2_CODENAME"
 		elif echo "$UBUNTU_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 5459781..48146a0 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -116,7 +116,7 @@ prepare_workspace() {
 	GIT_OBJECT_ID=`git show-ref -s heads/master`
 	cd "$PROJECT_DIR"
 
-	if [ -n "$ARGV2_CODENAME" ]; then
+	if [ "x$ARGV2_CODENAME" != "x" ]; then
 		if echo "$FEDORA_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then
 			RPM_BUILD_FOR="fedora:$ARGV2_CODENAME"
 		elif echo "$EPEL_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then


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




More information about the x2go-commits mailing list