diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-06-05 08:27:45 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-10-02 12:20:18 +0000 |
commit | 9db77a709691e8fed8ef49fac8bd4cf90c632e51 (patch) | |
tree | 04e22480650af2787c388d8eacc791e68eb30c18 /libexec/container/key | |
parent | Releasing debian version 20220604-1. (diff) | |
download | open-infrastructure-compute-tools-9db77a709691e8fed8ef49fac8bd4cf90c632e51.tar.xz open-infrastructure-compute-tools-9db77a709691e8fed8ef49fac8bd4cf90c632e51.zip |
Merging upstream version 20220605.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'libexec/container/key')
-rwxr-xr-x | libexec/container/key | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libexec/container/key b/libexec/container/key index 5deff0d..efd214e 100755 --- a/libexec/container/key +++ b/libexec/container/key @@ -146,12 +146,12 @@ case "${ACTION}" in if [ -e "${ADD}" ] then gpg --homedir "${KEYS}" --import "${ADD}" - elif [ -e "/usr/share/compute-tools/keys/${ADD}" ] + elif [ -e "/usr/share/${SOFTWARE}/keys/${ADD}" ] then - gpg --homedir "${KEYS}" --import "/usr/share/compute-tools/keys/${ADD}" - elif [ -e "/usr/share/compute-tools/keys/${ADD}.pub" ] + gpg --homedir "${KEYS}" --import "/usr/share/${SOFTWARE}/keys/${ADD}" + elif [ -e "/usr/share/${SOFTWARE}/keys/${ADD}.pub" ] then - gpg --homedir "${KEYS}" --import "/usr/share/compute-tools/keys/${ADD}.pub" + gpg --homedir "${KEYS}" --import "/usr/share/${SOFTWARE}/keys/${ADD}.pub" else gpg --homedir "${KEYS}" --recv "${ADD}" fi |