buildscripts.git - master (branch) updated: 5799b7c7fa70b7c6dc80ba9a22425476ff99f386 - x2go-commits

30 Nov 2013

The branch, master has been updated
       via  5799b7c7fa70b7c6dc80ba9a22425476ff99f386 (commit)
      from  5853b12787bacff429df4f683ad25a6b9d170de9 (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 5799b7c7fa70b7c6dc80ba9a22425476ff99f386
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sun Dec 1 00:04:19 2013 +0100

    ssh breaks while loops. Redirect stdin to avoid it.

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

Summary of changes:
 bin/build-rpm-package |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

The diff of changes is:

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 37e2fed..5f6b4ae 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -137,13 +137,13 @@ clear_pkgdist() {
 				test -z $CODENAMES || echo $line | grep $CODENAMES || break
 
 				for l_ARCH in x86_64 i386; do
-					[ "x$SKIP_ARCH" != "x$l_ARCH" ] && {
+					if [ "x$SKIP_ARCH" != "x$l_ARCH" ]; then
 						mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH"
 						#rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/dupload.conf"
 						rm -f "$PKGDIST/rpmbuild/SOURCES/$PROJECT-"*.tar.gz
 						rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/"*.log
 						rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT-"*.rpm
-					}
+					fi
 				done
 			done
 		}
@@ -235,22 +235,22 @@ upload_packages() {
 			test -z $CODENAMES || echo $line | grep $CODENAMES || break
 
 			for l_ARCH in x86_64 i386; do
-				[ "x$SKIP_ARCH" != "x$l_ARCH" ] && {
+				if [ "x$SKIP_ARCH" != "x$l_ARCH" ]; then
 
 					# create remote directories in archive
-					ssh $REPOS_SERVER mkdir -p $RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$l_ARCH/rpms
-					ssh $REPOS_SERVER mkdir -p $RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$l_ARCH/repodata
+					0</dev/null ssh $REPOS_SERVER mkdir -p $RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$l_ARCH/rpms
+					0</dev/null ssh $REPOS_SERVER mkdir -p $RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$l_ARCH/repodata
 
 					# remove rpm packages of the same name (pattern)
-					ssh $REPOS_SERVER rm -f $RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$l_ARCH/rpms/$PROJECT.*.rpm
+					0</dev/null ssh $REPOS_SERVER rm -f $RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$l_ARCH/rpms/$PROJECT.*.rpm
 
 					# copy rpms into repo
 					cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH"
 					scp *.rpm $REPOS_SERVER:$RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$l_ARCH/rpms/ || true
 
-					ssh $REPOS_SERVER "cd $RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$l_ARCH/ && createrepo ."
+					0</dev/null ssh $REPOS_SERVER "cd $RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$l_ARCH/ && createrepo ."
 
-				}
+				fi
 			done
 		done
 	done


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

    