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

Don't create rc.repo, mimic what the old repositories did

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-03-01 14:43:35 +00:00 • committed by Pedro Algarvio
parent bab28c4b18
commit 7030ac1832
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tools/pkgrepo.py
View file

@ -464,15 +464,15 @@ def rpm(
def _create_repo_file(create_repo_path, url_suffix):
ctx.info(f"Creating '{repo_file_path.relative_to(repo_path)}' file ...")
if nightly_build:
base_url = "salt-dev/py3/"
base_url = "salt-dev/"
repo_file_contents = "[salt-nightly-repo]"
elif rc_build:
base_url = "salt_rc/py3/"
base_url = "salt_rc/"
repo_file_contents = "[salt-rc-repo]"
else:
base_url = "py3/"
base_url = ""
repo_file_contents = "[salt-repo]"
base_url += f"{distro}/{url_suffix}"
base_url += f"salt/py3/{distro}/{url_suffix}"
if distro == "amazon":
distro_name = "Amazon Linux"
elif distro == "redhat":
@ -501,8 +501,6 @@ def rpm(
if nightly_build:
repo_file_path = create_repo_path.parent / "nightly.repo"
elif rc_build:
repo_file_path = create_repo_path.parent / "rc.repo"
else:
repo_file_path = create_repo_path.parent / f"{create_repo_path.name}.repo"