From 4d49e902ccb8f3bccc55d61f6613e6facaed44d2 Mon Sep 17 00:00:00 2001 From: Tobias Moltzahn <82589891+T0bl@users.noreply.github.com> Date: Mon, 3 Mar 2025 16:40:15 +0100 Subject: [PATCH 1/3] fixed deb822 template to support trailing / with Suites --- templates/source_deb822.epp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/templates/source_deb822.epp b/templates/source_deb822.epp index 10802b05d5..6a5bf98c65 100644 --- a/templates/source_deb822.epp +++ b/templates/source_deb822.epp @@ -14,8 +14,11 @@ Enabled: <%= $enabled %> Types: <% $types.each |String $type| { -%> <%= $type %> <% } %> URIs: <% $uris.each | String $uri | { -%> <%= $uri %> <% } %> -Suites: <% $suites.each | String $suite | { -%> <%= $suite %> <% } %> -Components: <% $components.each | String $component | { -%> <%= $component %> <% } %> +Suites: <% $suites.each |String $suite| { -%> <%= $suite %> +<% if $suite !~ /\/$/ { -%> +Components: <% $components.each |String $component| { -%> <%= $component %> <% } -%> +<% } -%> +<% } -%> <% if $architectures { -%> Architectures:<% $architectures.each | String $arch | { %> <%= $arch %><% } %> <%- } -%> From d77fc8f17716ee5264f725eebcad25a3ea0eca2d Mon Sep 17 00:00:00 2001 From: Tobias Moltzahn <82589891+T0bl@users.noreply.github.com> Date: Tue, 4 Mar 2025 08:51:13 +0100 Subject: [PATCH 2/3] fixed 'if' block when multiple suites are specified --- templates/source_deb822.epp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/templates/source_deb822.epp b/templates/source_deb822.epp index 6a5bf98c65..b4ad607c78 100644 --- a/templates/source_deb822.epp +++ b/templates/source_deb822.epp @@ -14,10 +14,9 @@ Enabled: <%= $enabled %> Types: <% $types.each |String $type| { -%> <%= $type %> <% } %> URIs: <% $uris.each | String $uri | { -%> <%= $uri %> <% } %> -Suites: <% $suites.each |String $suite| { -%> <%= $suite %> -<% if $suite !~ /\/$/ { -%> -Components: <% $components.each |String $component| { -%> <%= $component %> <% } -%> -<% } -%> +Suites: <% $suites.each |String $suite| { -%> <%= $suite %> <% } %> +<% if $suites[0] !~ /\/$/ { -%> +Components: <% $components.each |String $component| { -%> <%= $component %> <% } %> <% } -%> <% if $architectures { -%> Architectures:<% $architectures.each | String $arch | { %> <%= $arch %><% } %> From 4d7820d8962d5aaf8f45d3461a34374a493e57d6 Mon Sep 17 00:00:00 2001 From: Tobias Moltzahn <82589891+T0bl@users.noreply.github.com> Date: Tue, 4 Mar 2025 09:13:09 +0100 Subject: [PATCH 3/3] consistent appearance --- templates/source_deb822.epp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/source_deb822.epp b/templates/source_deb822.epp index b4ad607c78..5d09542ef5 100644 --- a/templates/source_deb822.epp +++ b/templates/source_deb822.epp @@ -12,11 +12,11 @@ | -%> # <%= $comment %> Enabled: <%= $enabled %> -Types: <% $types.each |String $type| { -%> <%= $type %> <% } %> +Types: <% $types.each | String $type | { -%> <%= $type %> <% } %> URIs: <% $uris.each | String $uri | { -%> <%= $uri %> <% } %> -Suites: <% $suites.each |String $suite| { -%> <%= $suite %> <% } %> +Suites: <% $suites.each | String $suite | { -%> <%= $suite %> <% } %> <% if $suites[0] !~ /\/$/ { -%> -Components: <% $components.each |String $component| { -%> <%= $component %> <% } %> +Components: <% $components.each | String $component | { -%> <%= $component %> <% } %> <% } -%> <% if $architectures { -%> Architectures:<% $architectures.each | String $arch | { %> <%= $arch %><% } %>