[X2Go-Commits] [buildscripts] 25/26: bin/sbuild-deb-package: backport from bin/build-deb-package: fix othermirror usage. Within X2Go package range, we need to pull in main, nightly or both depending on what package COMPONENT we are building.

[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 67bc89b8b1533dd3ce5fc2496a8966d3854eeece
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Nov 13 20:34:04 2016 +0100

    bin/sbuild-deb-package: backport from bin/build-deb-package: fix othermirror usage. Within X2Go package range, we need to pull in main, nightly or both depending on what package COMPONENT we are building.
---
 bin/sbuild-deb-package |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index b46214b..a356b90 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -302,9 +302,9 @@ build_packages() {
 				mkdir -p -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/"{amd64,i386}
 				OTHERMIRROR=""
 				if [ "x${COMPONENT}" = "x${COMPONENT_NIGHTLY}" ]; then
-					grep -qs "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}/${l_DIST}-nightly ${l_CODENAME} main"
+					grep -qs "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}/${l_DIST} ${l_CODENAME} ${COMPONENT_RELEASE} ${COMPONENT}"
 				else
-					grep "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}/${l_DIST} ${l_CODENAME} main"
+					grep "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}/${l_DIST} ${l_CODENAME} ${COMPONENT}"
 				fi
 				# create git changelog immediately prior to building the package
 				git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog

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