diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2010-09-12 14:48:01 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2010-09-12 14:48:01 +0200 |
| commit | e67a4695ee9550dfa7de153c48d3949891acb048 (patch) | |
| tree | 378900489ce616b2719e97da0c57c2ed824ec36f | |
| parent | dcf9b85295b36b3e510870052f3e617df84fce5e (diff) | |
| download | dbscripts-e67a4695ee9550dfa7de153c48d3949891acb048.tar.gz dbscripts-e67a4695ee9550dfa7de153c48d3949891acb048.tar.xz | |
check_pkgsvn: Don't assume the same PKGBUILD for all architectures
| -rw-r--r-- | db-functions | 10 |
1 files changed, 5 insertions, 5 deletions
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 |