From: Eli Schwartz <eschwa...@archlinux.org>

(this is a partial cherry pick of commit 
07e6a91da1331ae61b667d878092c5b03aa49ced)

When picking it, common.bash's PKGEXT= declaration has to be applied
after 'config' is sourced, as we have not yet picked the commit that
renames config:PKGEXT to config:PKGEXTS.

----

Fix overloading PKGEXT to mean two things.

PKGEXT is a makepkg variable referring to a fixed filename suffix, but
we were also using it to mean a bash glob referring to candidate
filenames. This is wrong, so rename it to PKGEXTS which is more
descriptive of its purpose.

Exclude the testsuite from this change, as the testsuite actually uses
PKGEXT for its intended purpose. Fix the testsuite to consistently use
PKGEXT, as it hardcoded the file extension in several cases, and pin
its value to .pkg.tar.xz
---
 test/lib/common.bash | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/lib/common.bash b/test/lib/common.bash
index 9c1ae4c..98b4469 100644
--- a/test/lib/common.bash
+++ b/test/lib/common.bash
@@ -59,7 +59,7 @@ __buildPackage() {
                else
                        sudo librechroot -n "dbscripts@${tarch}" -A "$tarch" 
make
                fi
-               sudo PKGDEST="${pkgdest}" libremakepkg -n "dbscripts@${tarch}"
+               sudo PKGDEST="${pkgdest}" PKGEXT="${PKGEXT}" libremakepkg -n 
"dbscripts@${tarch}"
        done
 
        pkgnames=($(. PKGBUILD; print_all_package_names))
@@ -101,6 +101,7 @@ setup() {
        SOURCE_CLEANUP_DRYRUN=false
 eot
        . config
+       PKGEXT=".pkg.tar.xz"
 
        mkdir -p 
"${TMP}/"{ftp,tmp,staging,{package,source}-cleanup,svn-packages-{copy,repo}}
 
-- 
2.16.2

_______________________________________________
Dev mailing list
Dev@lists.parabola.nu
https://lists.parabola.nu/mailman/listinfo/dev

Reply via email to