Skip to content

Commit

Permalink
update photon paths to use their $releasever string string which incl…
Browse files Browse the repository at this point in the history
…udes .0
  • Loading branch information
felippeb committed Dec 15, 2023
1 parent 622a9b3 commit fd4e3a2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions tests/pytests/pkg/download/test_pkg_download.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,9 @@ def setup_redhat_family(
):
arch = os.environ.get("SALT_REPO_ARCH") or "x86_64"

if os_name == "photon":
os_version = f"{os_version}.0"

if repo_subpath == "minor":
repo_url_base = (
f"{root_url}/{os_name}/{os_version}/{arch}/{repo_subpath}/{salt_release}"
Expand Down
3 changes: 3 additions & 0 deletions tools/pkg/repo/create.py
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,9 @@ def rpm(
assert incoming is not None
assert repo_path is not None
assert key_id is not None

if distro == "photon":
distro_version = f"{distro_version}.0"
display_name = f"{distro.capitalize()} {distro_version}"
if distro_version not in _rpm_distro_info[distro]:
ctx.error(f"Support for {display_name} is missing.")
Expand Down

0 comments on commit fd4e3a2

Please sign in to comment.