buildscripts.git - master (branch) updated: 5096e66050e68ddb8aea6e41e039d305762f571e - x2go-commits

30 Nov 2013

The branch, master has been updated
       via  5096e66050e68ddb8aea6e41e039d305762f571e (commit)
      from  dec5f1141adde867fd96ca2711cf9147ffda32d1 (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 5096e66050e68ddb8aea6e41e039d305762f571e
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sat Nov 30 20:28:17 2013 +0100

    include  in repos paths

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

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

The diff of changes is:

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index c0456b8..7632ac3 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -249,14 +249,17 @@ upload_packages() {
 				[ "x$SKIP_ARCH" != "x$l_ARCH" ] && {
 
 					# create remote directories in archive
-					ssh $REPOS_SERVER mkdir -p $RPM_REPOS_BASE/$l_DIST/$l_CODENAME/$l_ARCH/rpms
-					ssh $REPOS_SERVER mkdir -p $RPM_REPOS_BASE/$l_DIST/$l_CODENAME/$l_ARCH/repodata
+					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
+
+					# 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
 
 					# copy rpms into repo
 					cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH"
-					scp *.rpm $REPOS_SERVER:$RPM_REPOS_BASE/$l_DIST/$l_CODENAME/$l_ARCH/rpms/ || true
+					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/$l_CODENAME/$l_ARCH/ && createrepo ."
+					ssh $REPOS_SERVER "cd $RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$l_ARCH/ && createrepo ."
 
 				}
 			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).

    