From d639aa97e494c8fc0d8d73ceb92109f4d2213787 Mon Sep 17 00:00:00 2001 From: Ben Grande Date: Thu, 27 Feb 2025 11:49:47 +0100 Subject: [PATCH] fix: unify method to query template version Copying issue when creating the formula from its predecessor. --- salt/debian-xfce/template.jinja | 11 ++++++----- salt/fedora-xfce/template.jinja | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/salt/debian-xfce/template.jinja b/salt/debian-xfce/template.jinja index 95f196a..64142a7 100644 --- a/salt/debian-xfce/template.jinja +++ b/salt/debian-xfce/template.jinja @@ -1,15 +1,16 @@ {# -SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. +SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. SPDX-License-Identifier: AGPL-3.0-or-later #} -{% set base = 'debian' -%} -{% set version = salt['pillar.get']('qvm:debian:version', '12') -%} +{%- import "debian/template.jinja" as template_base -%} +{% set base = template_base.base -%} +{% set version = template_base.version -%} {% set flavor = 'xfce' -%} -{% set repo = salt['pillar.get']('qvm:debian:repo', 'qubes-templates-itl') -%} +{% set repo = template_base.repo -%} {% if flavor -%} {% set flavor = '-' ~ flavor -%} {% endif -%} -{% set template = base ~ '-' ~ version ~ flavor -%} +{% set template = base ~ '-' ~ version ~ flavor -%} {% set template_clean = base ~ flavor -%} diff --git a/salt/fedora-xfce/template.jinja b/salt/fedora-xfce/template.jinja index 609841b..d39a376 100644 --- a/salt/fedora-xfce/template.jinja +++ b/salt/fedora-xfce/template.jinja @@ -1,15 +1,16 @@ {# -SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. +SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. SPDX-License-Identifier: AGPL-3.0-or-later #} -{% set base = 'fedora' -%} -{% set version = salt['pillar.get']('qvm:fedora:version', '39') -%} +{%- import "fedora/template.jinja" as template_base -%} +{% set base = template_base.base -%} +{% set version = template_base.version -%} {% set flavor = 'xfce' -%} -{% set repo = salt['pillar.get']('qvm:fedora:repo', 'qubes-templates-itl') -%} +{% set repo = template_base.repo -%} {% if flavor -%} {% set flavor = '-' ~ flavor -%} {% endif -%} -{% set template = base ~ '-' ~ version ~ flavor -%} +{% set template = base ~ '-' ~ version ~ flavor -%} {% set template_clean = base ~ flavor -%}