diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-04-01 09:49:39 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-01 09:49:39 +0200 |
| commit | 0bfe67fb6cc6e5c5c89ce6c10e087a21ecf0eae8 (patch) | |
| tree | 4d4d2e8c968f4a115b4fbbd5f2b38e239e80bb4b | |
| parent | 5784e3747b6ea2b0fc9e60a54676fa9ccabeacef (diff) | |
| download | buildscripts-0bfe67fb6cc6e5c5c89ce6c10e087a21ecf0eae8.tar.gz buildscripts-0bfe67fb6cc6e5c5c89ce6c10e087a21ecf0eae8.tar.bz2 buildscripts-0bfe67fb6cc6e5c5c89ce6c10e087a21ecf0eae8.zip | |
bin/build-rpm-package: respect WANT_EXTRA parameter in get_extra_repository() for OBS builds.
| -rwxr-xr-x | bin/build-rpm-package | 11 |
1 files 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") |