[X2Go-Commits] [buildscripts] 01/07: bin/build-rpm-package: respect WANT_EXTRA parameter in get_extra_repository() for OBS builds.
git-admin at x2go.org
git-admin at x2go.org
Wed Apr 1 10:18:07 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository buildscripts.
commit 0bfe67fb6cc6e5c5c89ce6c10e087a21ecf0eae8
Author: Mihai Moldovan <ionic at ionic.de>
Date: Wed Apr 1 09:49:39 2015 +0200
bin/build-rpm-package: respect WANT_EXTRA parameter in get_extra_repository() for OBS builds.
---
bin/build-rpm-package | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index f0ffdcd..5c0f8f9 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -409,13 +409,16 @@ get_extra_repository () {
typeset WANT_EXTRA="$(make_boolean "${7}")"
typeset ret=""
- # Note: we always add the extras repo, because that's defined as "packages missing from the main repository".
+ # Note: we always add the extras repo, because that's defined as "packages missing from the main repository",
+ # unless explicitly overridden via ${WANT_EXTRA}.
case "${TYPE}" in
"suse")
# FIXME: make this package repository consistent with our main ones.
- ret="--repo http://${REPOS_SERVER}/${DIST}/${CODENAME}/extras"
- if [ -z "${PACKAGE_WITHOUT_OTHERMIRROR}" ] || [ "${PACKAGE_WITHOUT_OTHERMIRROR}" != "${PACKAGE}" ]; then
- ret="${ret} --repo http://${REPOS_SERVER}/${DIST}/${CODENAME}/${COMPONENT}/${ARCH}"
+ if [ "${WANT_EXTRA}" -eq "1" ]; then
+ ret="--repo http://${REPOS_SERVER}/${DIST}/${CODENAME}/extras"
+ if [ -z "${PACKAGE_WITHOUT_OTHERMIRROR}" ] || [ "${PACKAGE_WITHOUT_OTHERMIRROR}" != "${PACKAGE}" ]; then
+ ret="${ret} --repo http://${REPOS_SERVER}/${DIST}/${CODENAME}/${COMPONENT}/${ARCH}"
+ fi
fi
;;
"redhat")
--
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