[X2Go-Commits] [buildscripts] 01/01: bin/build-rpm-package: fix *SuSE download URL handling.

git-admin at x2go.org git-admin at x2go.org
Sat Jun 2 04:28:40 CEST 2018


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

x2go pushed a commit to branch master
in repository buildscripts.

commit 01cc8443913b08e1b05b3919f4e193cbfc7c71d7
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Jun 2 04:28:36 2018 +0200

    bin/build-rpm-package: fix *SuSE download URL handling.
---
 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 d3fba78..f38ded7 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -1008,12 +1008,12 @@ build_packages() {
 						fi
 
 						if [ "${legacy_release}" -eq "1" ]; then
-							download_url="${OPENSUSE_DOWNLOAD_ARCHIVE_URL}"
+							download_url=( "${OPENSUSE_DOWNLOAD_ARCHIVE_URL[@]}" )
 						else
 							if [[ "${tmp_suse_major_version}" = "9999" ]]; then
-								download_url="${OPENSUSE_DOWNLOAD_TUMBLEWEED_URL}"
+								download_url=( "${OPENSUSE_DOWNLOAD_TUMBLEWEED_URL[@]}" )
 							else
-								download_url="${OPENSUSE_DOWNLOAD_URL}"
+								download_url=( "${OPENSUSE_DOWNLOAD_URL[@]}" )
 							fi
 						fi
 
@@ -1050,8 +1050,8 @@ build_packages() {
 							extra_obs_build_args+=( "--configdir" "${TEMP_DIR}/${obs_config_dir}" )
 						fi
 					elif [ "x${l_DIST}" = "xsle" ]; then
-						for ((i = 0; i < ${#sle_download_url[@]}; ++i)) do
-							download_url[i]="$(sed "s/#VERSION#/${l_CODENAME}/g" <<< "${sle_download_url[i]}")"
+						for ((i = 0; i < ${#SLE_DOWNLOAD_URL[@]}; ++i)) do
+							download_url[i]="$(sed "s/#VERSION#/${l_CODENAME}/g" <<< "${SLE_DOWNLOAD_URL[i]}")"
 						done
 						if [ "${tmp_suse_major_version}" -lt "12" ]; then
 							BUILD_RESULT="/usr/src/packages"

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git


More information about the x2go-commits mailing list