summaryrefslogtreecommitdiffstats
path: root/test/lib
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2011-03-23 19:50:56 +0100
committerPierre Schmitz <pierre@archlinux.de>2011-03-23 19:50:56 +0100
commitd568b8aeb0be95d6a1da7da0434de23e6b2260e2 (patch)
tree3051c14427751e9e79b1f4878fb6e8299440d728 /test/lib
parent9e4f661adf89d150b0891d6edd39e19682d923bf (diff)
downloaddbscripts-d568b8aeb0be95d6a1da7da0434de23e6b2260e2.tar.gz
dbscripts-d568b8aeb0be95d6a1da7da0434de23e6b2260e2.tar.xz
Add support for packages which use the epoch variable
Diffstat (limited to 'test/lib')
-rw-r--r--test/lib/common.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/lib/common.inc b/test/lib/common.inc
index 208400c..46747ff 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -18,7 +18,7 @@ oneTimeSetUp() {
pushd $d >/dev/null
pkgname=($(. PKGBUILD; echo ${pkgname[@]}))
pkgarch=($(. PKGBUILD; echo ${arch[@]}))
- pkgversion=$(. PKGBUILD; echo ${pkgver}-${pkgrel})
+ pkgversion=$(. PKGBUILD; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
build=true
for a in ${pkgarch[@]}; do
@@ -112,7 +112,7 @@ releasePackage() {
pushd "${TMP}/svn-packages-copy"/${pkgbase}/trunk/ >/dev/null
archrelease ${repo}-${arch} >/dev/null 2&>1
- pkgver=$(. PKGBUILD; echo "${pkgver}-${pkgrel}")
+ pkgver=$(. PKGBUILD; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
popd >/dev/null
cp "${pkgdir}/${pkgbase}"/*-${pkgver}-${arch}.pkg.tar.* "${STAGING}"/${repo}/
}