backports: pin using codename on Debian

Debian 11 bullseye and Debian 12 bookworm backports release files look like this: https://deb.debian.org/debian/dists/bullseye-backports/InRelease: Suite: bullseye-backports Codename: bullseye-backports https://deb.debian.org/debian/dists/bookworm-backports/InRelease: Suite: stable-backports Codename: bookworm-backports Using "release" (aka Suite in the InRelease file) causes our pin to not match for bookworm because they changed it to stable-backports instead of $codename-backports. We can use codename to support both for this pin. Fixes #1187.
puppetlabs · Nov 21, 2024 · 7e78e9c · 7e78e9c
1 parent a229aed
commit 7e78e9c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/manifests/backports.pp b/manifests/backports.pp
@@ -94,11 +94,14 @@
   if $pin =~ Hash {
     $_pin = $pin
   } elsif $pin =~ Numeric or $pin =~ String {
-    # apt::source defaults to pinning to origin, but we should pin to release
-    # for backports
+    $pin_type = $facts['os']['name'] ? {
+      'Debian' => 'codename',
+      'Ubuntu' => 'release',
+    }
+
     $_pin = {
       'priority' => $pin,
-      'release'  => $_release,
+      $pin_type  => $_release,
     }
   } else {
     fail('pin must be either a string, number or hash')

diff --git a/spec/classes/apt_backports_spec.rb b/spec/classes/apt_backports_spec.rb
@@ -32,7 +32,7 @@
           release: 'bookworm-backports',
           pin: {
             'priority' => 200,
-            'release' => 'bookworm-backports'
+            'codename' => 'bookworm-backports'
           },
           keyring: '/usr/share/keyrings/debian-archive-keyring.gpg',
         )