From e65089029922b8a56bde8a82e4add1556204beaf Mon Sep 17 00:00:00 2001 From: Adin Scannell Date: Tue, 25 Aug 2020 14:28:03 -0700 Subject: Provide --secret-keyring parameter (for newer gpg). PiperOrigin-RevId: 328403914 --- tools/make_apt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/make_apt.sh b/tools/make_apt.sh index 3fb1066e5..b47977ed5 100755 --- a/tools/make_apt.sh +++ b/tools/make_apt.sh @@ -64,8 +64,8 @@ trap cleanup EXIT # is not found. This isn't actually a failure for us, because we don't require # the public (this may be stored separately). The second import will succeed # because, in reality, the first import succeeded and it's a no-op. -gpg --no-default-keyring --keyring "${keyring}" --import "${private_key}" || \ - gpg --no-default-keyring --keyring "${keyring}" --import "${private_key}" +gpg --no-default-keyring --keyring "${keyring}" --secret-keyring "${keyring}" --import "${private_key}" || \ + gpg --no-default-keyring --keyring "${keyring}" --secret-keyring "${keyring}" --import "${private_key}" # Copy the packages into the root. for pkg in "$@"; do -- cgit v1.2.3