From 0cca2d2ff38aedc282b7c4024cb464c49cb91552 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sat, 7 Dec 2013 23:22:12 +0100
Subject: upload RPMs to project subfolders in yum repository

---
 bin/build-rpm-package | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'bin')

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index e5e583b..8a48c12 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -253,17 +253,17 @@ upload_packages() {
 				if [ "x$SKIP_ARCH" != "x$l_ARCH" ]; then
 
 					# create remote directories in archive
-					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
+					0</dev/null ssh $REPOS_SERVER mkdir -p $RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$PROJECT/$l_ARCH/rpms
+					0</dev/null ssh $REPOS_SERVER mkdir -p $RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$PROJECT/$l_ARCH/repodata
 
 					# remove rpm packages of the same name (pattern)
-					0</dev/null 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/$PROJECT/$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
+					scp *.rpm $REPOS_SERVER:$RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$PROJECT/$l_ARCH/rpms/ || true
 
-					0</dev/null 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/$PROJECT/$l_ARCH/ && createrepo ."
 
 				fi
 			done
-- 
cgit v1.2.3