diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-04-17 12:21:40 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-04-17 12:21:40 -0400 |
| commit | 0b96686ab36ddc29e07281d52dd7790c5c5ca89d (patch) | |
| tree | aa5c505f4bd102fe9bbff51e6cca2769c1e014bd | |
| parent | afa918c0ea0e773acb8df5136f7b76e75c03dea6 (diff) | |
test/lib/common.inc: fix a bad merge
| -rw-r--r-- | test/lib/common.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/lib/common.inc b/test/lib/common.inc index d0c7fec..eede414 100644 --- a/test/lib/common.inc +++ b/test/lib/common.inc @@ -39,7 +39,7 @@ oneTimeSetUp() { pushd "$d" >/dev/null pkgname=($(. PKGBUILD; echo "${pkgname[@]}")) pkgarch=($(. PKGBUILD; echo "${arch[@]}")) - pkgversion=$(. PKGBUILD; get_full_version "${epoch:-0}" "${pkgver}" "${pkgrel}") + pkgversion=$(. PKGBUILD; get_full_version) build=true for a in "${pkgarch[@]}"; do @@ -153,7 +153,7 @@ releasePackage() { pushd "${TMP}/svn-packages-copy/${pkgbase}/trunk/" >/dev/null xbs release "${repo}" "${arch}" >/dev/null 2>&1 - pkgver=$(. PKGBUILD; 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}/" |