summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAdin Scannell <ascannell@google.com>2020-08-25 14:28:03 -0700
committerAndrei Vagin <avagin@gmail.com>2020-09-09 17:53:10 -0700
commite6a1608bc71308fecf951970f17db0bba2611ff0 (patch)
tree812be1d87f24387262caebaaf7a3c365756f632f
parent9e7a83e0f283965c6fbfa3d596421508dd088c58 (diff)
Provide --secret-keyring parameter (for newer gpg).
PiperOrigin-RevId: 328403914
-rwxr-xr-xtools/make_apt.sh4
1 files changed, 2 insertions, 2 deletions
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