From 0a8bd5fe11eef43cc95dc9468e8302e4872f902e Mon Sep 17 00:00:00 2001 From: Justin Zandbergen Date: Thu, 25 Apr 2024 14:27:03 +0200 Subject: [PATCH] fix(pkgrepo): New style since 3006 not 3005 --- salt/osfamilymap.yaml | 2 +- salt/osfingermap.yaml | 2 +- salt/osmap.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/osfamilymap.yaml b/salt/osfamilymap.yaml index 3ad3f29..05ba4d7 100644 --- a/salt/osfamilymap.yaml +++ b/salt/osfamilymap.yaml @@ -16,7 +16,7 @@ # Different salt versions have different repo's, keyrings, pubkeys and hashes. # 'latest' cannot be coerced into an integer and it's result will be int(0). -{%- if salt_release.split('.')[0] | int >= 3005 or salt_release.split('.')[0] | int == 0 %} +{%- if salt_release.split('.')[0] | int >= 3006 or salt_release.split('.')[0] | int == 0 %} {%- set default_repo = 'https://repo.saltproject.io/salt' %} {%- set default_repo_keyring_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.gpg' %} {%- set default_repo_pubkey_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.pub' %} diff --git a/salt/osfingermap.yaml b/salt/osfingermap.yaml index b4c258a..2149bb9 100644 --- a/salt/osfingermap.yaml +++ b/salt/osfingermap.yaml @@ -14,7 +14,7 @@ # Different salt versions have different repo's, keyrings, pubkeys and hashes. # 'latest' cannot be coerced into an integer and it's result will be int(0). -{%- if salt_release.split('.')[0] | int >= 3005 or salt_release.split('.')[0] | int == 0 %} +{%- if salt_release.split('.')[0] | int >= 3006 or salt_release.split('.')[0] | int == 0 %} {%- set default_repo = 'https://repo.saltproject.io/salt' %} {%- set default_repo_keyring_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.gpg' %} {%- set default_repo_pubkey_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.pub' %} diff --git a/salt/osmap.yaml b/salt/osmap.yaml index 81c77d2..ae3fc72 100644 --- a/salt/osmap.yaml +++ b/salt/osmap.yaml @@ -16,7 +16,7 @@ # Different salt versions have different repo's, keyrings, pubkeys and hashes. # 'latest' cannot be coerced into an integer and it's result will be int(0). -{%- if salt_release.split('.')[0] | int >= 3005 or salt_release.split('.')[0] | int == 0 %} +{%- if salt_release.split('.')[0] | int >= 3006 or salt_release.split('.')[0] | int == 0 %} {%- set default_repo = 'https://repo.saltproject.io/salt' %} {%- set default_repo_keyring_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.gpg' %} {%- set default_repo_pubkey_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.pub' %}