[arch-commits] Commit in archlinux-keyring/trunk (PKGBUILD archlinux-keyring.install)

[Florian Pritz]

    Date: Saturday, February 9, 2019 @ 22:31:05
  Author: bluewind
Revision: 345783

upgpkg: archlinux-keyring 20190123-2

Always reenable alad\'s key

Modified:
  archlinux-keyring/trunk/PKGBUILD
  archlinux-keyring/trunk/archlinux-keyring.install

---------------------------+
 PKGBUILD                  |    2 +-
 archlinux-keyring.install |   14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-09 20:36:38 UTC (rev 345782)
+++ PKGBUILD	2019-02-09 22:31:05 UTC (rev 345783)
@@ -3,7 +3,7 @@
 
 pkgname=archlinux-keyring
 pkgver=20190123
-pkgrel=1
+pkgrel=2
 pkgdesc='Arch Linux PGP keyring'
 arch=(any)
 url='https://projects.archlinux.org/archlinux-keyring.git/'

Modified: archlinux-keyring.install
===================================================================
--- archlinux-keyring.install	2019-02-09 20:36:38 UTC (rev 345782)
+++ archlinux-keyring.install	2019-02-09 22:31:05 UTC (rev 345783)
@@ -4,14 +4,12 @@
 
 		# Re-enable key of alad
 		# See https://bugs.archlinux.org/task/35478
-		if [[ -z "$2" ]] || [[ "$(vercmp "$2" "20181018-1")" -lt 0 ]]; then
-			printf 'enable\nquit\n' | LANG=C \
-				gpg --homedir /etc/pacman.d/gnupg \
-				--no-permission-warning --command-fd 0 \
-				--quiet --batch --edit-key \
-				DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A \
-				2>/dev/null
-		fi
+		printf 'enable\nquit\n' | LANG=C \
+			gpg --homedir /etc/pacman.d/gnupg \
+			--no-permission-warning --command-fd 0 \
+			--quiet --batch --edit-key \
+			DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A \
+			2>/dev/null
 	fi
 }