saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 17:50:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

The gpgkey must have the full URL

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-03-28 21:35:20 +01:00 • committed by Thomas Phipps
parent a2cde281da
commit 24929f6938
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/pkg/repo.py
View file

@ -507,7 +507,7 @@ def rpm(
enabled=1
enabled_metadata=1
gpgcheck=1
gpgkey={base_url}/{tools.utils.GPG_KEY_FILENAME}.pub
gpgkey=https://{repo_domain}/{base_url}/{tools.utils.GPG_KEY_FILENAME}.pub
"""
)
create_repo_path.write_text(repo_file_contents)
@ -1133,10 +1133,9 @@ def release(ctx: Context, salt_version: str):
Callback=tools.utils.UpdateProgress(progress, task),
)
updated_contents = re.sub(
r"^baseurl=https://([^/]+)/(.*)$",
rf"baseurl=https://{release_domain}/\2",
r"^(baseurl|gpgkey)=https://([^/]+)/(.*)$",
rf"\1=https://{release_domain}/\3",
repo_file_path.read_text(),
count=1,
flags=re.MULTILINE,
)
ctx.info(f"Updated '{repo_file_path.relative_to(repo_path)}:")