From d568b8aeb0be95d6a1da7da0434de23e6b2260e2 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 23 Mar 2011 19:50:56 +0100
Subject: Add support for packages which use the epoch variable

---
 test/lib/common.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test/lib')

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}/
 }
-- 
cgit v1.2.3-24-g4f1b