[X2Go-Commits] [buildscripts] 01/01: bin/build-rpm-package: add component, as we want to pull in repositories for specific package categoeries (main, nightly, LTS).

git-admin at x2go.org git-admin at x2go.org
Mon Mar 23 01:31:18 CET 2015


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

x2go pushed a commit to branch master
in repository buildscripts.

commit 138d1679702f50e5b1f207d1caa9f74463da64cf
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Mar 23 01:31:13 2015 +0100

    bin/build-rpm-package: add component, as we want to pull in repositories for specific package categoeries (main, nightly, LTS).
---
 bin/build-rpm-package |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 6a66ce4..7dbd952 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -131,14 +131,14 @@ get_extra_repository () {
 				ret="${ret} ${RPM_MOCK_CONFIG_DIR}"
 
 				# Mock config file names shall follow the format:
-				# distname-distversion-arch[-extra_repo_base_name[-extra_repo_full_name]]
-				# ^------ mandatory ------^^----------------- optional -----------------^
-				# ^------- default -------^^---- for extras ----^^--- for everything ---^
+				# distname-distversion-arch[-component-extra_repo_base_name[-extra_repo_full_name]]
+				# ^------ mandatory ------^^---------------------- optional ----------------------^
+				# ^------- default -------^            ^--- for extras ---^^--- for everything ---^
 
 				# Add mandatory, default value.
 				ret="${ret} ${DIST}-${CODENAME}-${ARCH}"
 				if [ -n "${RPM_EXTRA_REPO_MOCK_CONFIG_BASE_NAME}" ]; then
-					ret="${ret}-${RPM_EXTRA_REPO_MOCK_CONFIG_BASE_NAME}"
+					ret="${ret}-${COMPONENT}-${RPM_EXTRA_REPO_MOCK_CONFIG_BASE_NAME}"
 
 					if [-n "${RPM_EXTRA_REPO_MOCK_CONFIG_FULL_NAME}" ] && [ -z "${PACKAGE_WITHOUT_OTHERMIRROR}" ] || \
 					   [ "${PACKAGE_WITHOUT_OTHERMIRROR}" != "${PACKAGE}" ]; then

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


More information about the x2go-commits mailing list