summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-06-29 00:45:43 -0600
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-06-29 00:45:43 -0600
commit7034eed1f7ceec379b34f8dd782fb986c7165ad4 (patch)
treef27909fc75724e6e9ab0115055b9dd17a0624cec /test
parentd744cae51bf5ea3e8c01d70ddbec564ad66b036c (diff)
use the get_full_version from libremessages (actually, common.sh)
It works properly when split packages have different versions.
Diffstat (limited to 'test')
-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 396f12f..2f308dd 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -54,7 +54,7 @@ oneTimeSetUp() {
pushd $d >/dev/null
pkgname=($(. PKGBUILD; echo ${pkgname[@]}))
pkgarch=($(. PKGBUILD; echo ${arch[@]}))
- pkgversion=$(. PKGBUILD; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
+ pkgversion=$(. PKGBUILD; get_full_version)
build=true
for a in ${pkgarch[@]}; do
@@ -169,7 +169,7 @@ releasePackage() {
pushd "${TMP}/svn-packages-copy"/${pkgbase}/trunk/ >/dev/null
xbs release ${repo} ${arch} >/dev/null 2>&1
- pkgver=$(. PKGBUILD; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
+ pkgver=$(. PKGBUILD; get_full_version)
pkgname=($(. PKGBUILD; echo ${pkgname[@]}))
popd >/dev/null
cp "${pkgdir}/${pkgbase}"/*-${pkgver}-${arch}${PKGEXT} "${STAGING}"/${repo}/