[X2Go-Commits] [buildscripts] 05/05: bin/build-rpm-package: use RPM_WANT_EXTRA_REPOS when calling get_extra_repository().

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository buildscripts.

commit 5784e3747b6ea2b0fc9e60a54676fa9ccabeacef
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Apr 1 09:27:59 2015 +0200

    bin/build-rpm-package: use RPM_WANT_EXTRA_REPOS when calling get_extra_repository().
---
 bin/build-rpm-package |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 948ea6a..f0ffdcd 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -595,7 +595,7 @@ build_packages() {
 					rm -f $PKGDIST/$l_DIST/$l_CODENAME/x86_64/build.log
 
 					# Obtain packages from our RPM repository.
-					MOCK_CHROOT_CONFIG="$(get_extra_repository "redhat" "${l_DIST}" "${l_CODENAME}" "${COMPONENT}" "${PROJECT}" "x86_64")"
+					MOCK_CHROOT_CONFIG="$(get_extra_repository "redhat" "${l_DIST}" "${l_CODENAME}" "${COMPONENT}" "${PROJECT}" "x86_64" "${RPM_WANT_EXTRA_REPOS}")"
 					if mock --buildsrpm \
 					          ${MOCK_CHROOT_CONFIG} \
 					          --resultdir="$PKGDIST/$l_DIST/$l_CODENAME/rpmbuild/SRPMS" \
@@ -635,7 +635,7 @@ build_packages() {
 						done
 
 						# Obtain packages from our RPM repository.
-						OTHERMIRROR="$(get_extra_repository "suse" "${l_DIST}" "${l_CODENAME}" "${COMPONENT}" "${PROJECT}" "x86_64")"
+						OTHERMIRROR="$(get_extra_repository "suse" "${l_DIST}" "${l_CODENAME}" "${COMPONENT}" "${PROJECT}" "x86_64" "${RPM_WANT_EXTRA_REPOS}")"
 						if sudo obs-build \
 						             --nosignature \
 						             ${OTHERMIRROR} \
@@ -666,7 +666,7 @@ build_packages() {
 						done
 
 						# Obtain packages from our RPM repository.
-						MOCK_CHROOT_CONFIG="$(get_extra_repository "redhat" "${l_DIST}" "${l_CODENAME}" "${COMPONENT}" "${PROJECT}" "x86_64")"
+						MOCK_CHROOT_CONFIG="$(get_extra_repository "redhat" "${l_DIST}" "${l_CODENAME}" "${COMPONENT}" "${PROJECT}" "x86_64" "${RPM_WANT_EXTRA_REPOS}")"
 						ls $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.*.src.rpm | while read srpm; do
 							if mock ${MOCK_CHROOT_CONFIG} --resultdir="$PKGDIST/$l_DIST/$l_CODENAME/x86_64" "$srpm"; then
 								# copy and later sign source RPM
@@ -712,7 +712,7 @@ build_packages() {
 						done
 
 						# Obtain packages from our RPM repository.
-						OTHERMIRROR="$(get_extra_repository "suse" "${l_DIST}" "${l_CODENAME}" "${COMPONENT}" "${PROJECT}" "i386")"
+						OTHERMIRROR="$(get_extra_repository "suse" "${l_DIST}" "${l_CODENAME}" "${COMPONENT}" "${PROJECT}" "i386" "${RPM_WANT_EXTRA_REPOS}")"
 						if linux32 sudo obs-build \
 						                    --nosignature \
 						                    ${OTHERMIRROR} \
@@ -746,7 +746,7 @@ build_packages() {
 						rm -f $PKGDIST/$l_DIST/$l_CODENAME/i386/build.log
 
 						# Obtain packages from our RPM repository.
-						MOCK_CHROOT_CONFIG="$(get_extra_repository "redhat" "${l_DIST}" "${l_CODENAME}" "${COMPONENT}" "${PROJECT}" "i386")"
+						MOCK_CHROOT_CONFIG="$(get_extra_repository "redhat" "${l_DIST}" "${l_CODENAME}" "${COMPONENT}" "${PROJECT}" "i386" "${RPM_WANT_EXTRA_REPOS}")"
 						ls $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.*.src.rpm | while read srpm; do
 							if nice mock ${MOCK_CHROOT_CONFIG} --resultdir="$PKGDIST/$l_DIST/$l_CODENAME/i386" "$srpm"; then
 								# only copy and sign source RPM if necessary

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