1password: map the tarball architecture inside package() so the PKGBUILD's version can be read without CARCH
The file-scope case on CARCH ended in 'return 1', which aborted any 'source PKGBUILD' that did not export CARCH before pkgver and pkgrel were assigned. check-versions reads PKGBUILDs that way, saw an empty version, queued 8.12.34-35 on every tick, and promotion then refused to overwrite the already-published artifact. Every channel has been in backoff since 06:41 UTC today because of it.
This commit is contained in:
1 file changed
+11
-7
@@ -1,11 +1,4 @@
|
||||
pkgname=1password
|
||||
|
||||
case "$CARCH" in
|
||||
x86_64) _tararch=x64 ;;
|
||||
aarch64) _tararch=arm64 ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
|
||||
pkgver=8.12.34
|
||||
pkgrel=35
|
||||
conflicts=('1password-beta' '1password-beta-bin')
|
||||
@@ -34,6 +27,17 @@ validpgpkeys=('3FEF9748469ADBE15DA7CA80AC2D62742012EA22')
|
||||
package() {
|
||||
depends=('hicolor-icon-theme' 'libgtk-3.so=0' 'nss' 'xdg-utils')
|
||||
|
||||
# 1Password names its tarballs by a vendor architecture suffix. arch=()
|
||||
# above already limits which architectures makepkg builds, so no fallback
|
||||
# branch is needed here; keeping this inside package() means sourcing the
|
||||
# PKGBUILD without CARCH (as the version check does) still reads the
|
||||
# version correctly.
|
||||
local _tararch
|
||||
case "$CARCH" in
|
||||
x86_64) _tararch=x64 ;;
|
||||
aarch64) _tararch=arm64 ;;
|
||||
esac
|
||||
|
||||
# Go to source directory
|
||||
cd "1password-${pkgver}.${_tararch}"
|
||||
|
||||
|
||||
Reference in new issue
Block a user