From e67a4695ee9550dfa7de153c48d3949891acb048 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 12 Sep 2010 14:48:01 +0200 Subject: check_pkgsvn: Don't assume the same PKGBUILD for all architectures --- db-functions | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'db-functions') diff --git a/db-functions b/db-functions index f7699ff..cf13531 100644 --- a/db-functions +++ b/db-functions @@ -300,17 +300,17 @@ check_pkgsvn() { in_array "${repo}" ${PKGREPOS[@]} || return 1 - if [ ! -f "${WORKDIR}/pkgbuilds/${repo}/${_pkgbase}" ]; then - mkdir -p "${WORKDIR}/pkgbuilds/${repo}" + if [ ! -f "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" ]; then + mkdir -p "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}" svn export -q "${SVNREPO}/${_pkgbase}/repos/${repo}-${_pkgarch}/PKGBUILD" \ - "${WORKDIR}/pkgbuilds/${repo}/${_pkgbase}" >/dev/null + "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" >/dev/null [ $? -ge 1 ] && return 1 fi - local svnver="$(. "${WORKDIR}/pkgbuilds/${repo}/${_pkgbase}"; echo "${pkgver}-${pkgrel}")" + local svnver="$(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo "${pkgver}-${pkgrel}")" [ "${svnver}" == "${_pkgver}" ] || return 1 - local svnnames=($(. "${WORKDIR}/pkgbuilds/${repo}/${_pkgbase}"; echo ${pkgname[@]})) + local svnnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo ${pkgname[@]})) in_array "${_pkgname}" ${svnnames[@]} || return 1 return 0 -- cgit v1.2.3-24-g4f1b