fix: unify method to query template version

Copying issue when creating the formula from its predecessor.
This commit is contained in:
Ben Grande 2025-02-27 11:49:47 +01:00
parent a67c6c6815
commit d639aa97e4
No known key found for this signature in database
GPG Key ID: 00C64E14F51F9E56
2 changed files with 12 additions and 10 deletions

View File

@ -1,13 +1,14 @@
{# {#
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% set base = 'debian' -%} {%- import "debian/template.jinja" as template_base -%}
{% set version = salt['pillar.get']('qvm:debian:version', '12') -%} {% set base = template_base.base -%}
{% set version = template_base.version -%}
{% set flavor = 'xfce' -%} {% set flavor = 'xfce' -%}
{% set repo = salt['pillar.get']('qvm:debian:repo', 'qubes-templates-itl') -%} {% set repo = template_base.repo -%}
{% if flavor -%} {% if flavor -%}
{% set flavor = '-' ~ flavor -%} {% set flavor = '-' ~ flavor -%}
{% endif -%} {% endif -%}

View File

@ -1,13 +1,14 @@
{# {#
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% set base = 'fedora' -%} {%- import "fedora/template.jinja" as template_base -%}
{% set version = salt['pillar.get']('qvm:fedora:version', '39') -%} {% set base = template_base.base -%}
{% set version = template_base.version -%}
{% set flavor = 'xfce' -%} {% set flavor = 'xfce' -%}
{% set repo = salt['pillar.get']('qvm:fedora:repo', 'qubes-templates-itl') -%} {% set repo = template_base.repo -%}
{% if flavor -%} {% if flavor -%}
{% set flavor = '-' ~ flavor -%} {% set flavor = '-' ~ flavor -%}
{% endif -%} {% endif -%}