From 277bf6a3343be2187c149000c5e5af0d84f9ef95 Mon Sep 17 00:00:00 2001 From: Gabriel Nagy Date: Wed, 13 Jan 2021 14:21:34 +0200 Subject: [PATCH] (MODULES-10897) Fix GPG key typo Accidentaly removed the RPM part of the filename when getting the GPG key for SLES in the install task. This commit adds it back and imports both keys when installing puppet_agent on SLES, for compatibility reasons. --- tasks/install_shell.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tasks/install_shell.sh b/tasks/install_shell.sh index 494f2bfad..deca47c42 100644 --- a/tasks/install_shell.sh +++ b/tasks/install_shell.sh @@ -513,10 +513,12 @@ info "Downloading Puppet $version for ${platform}..." case $platform in "SLES") info "SLES platform! Lets get you an RPM..." - gpg_key="${tmp_dir}/RPM-GPG-KEY-puppet-20250406" - do_download "https://yum.puppet.com/GPG-KEY-puppet-20250406" "$gpg_key" - rpm --import "$gpg_key" - rm -f "$gpg_key" + for key in "puppet" "puppet-20250406"; do + gpg_key="${tmp_dir}/RPM-GPG-KEY-${key}" + do_download "https://yum.puppet.com/RPM-GPG-KEY-${key}" "$gpg_key" + rpm --import "$gpg_key" + rm -f "$gpg_key" + done filetype="noarch.rpm" filename="${collection}-release-sles-${platform_version}.noarch.rpm" download_url="${yum_source}/${filename}"