From 6fb3eefde9f9c2a48781731dfe996fa9ea5b517d Mon Sep 17 00:00:00 2001 From: David Prevot Date: Thu, 26 Oct 2023 16:42:34 +0200 Subject: [PATCH] apt: Drop preferences (pinning) for backports --- apt/files/bookworm_backports_preferences | 3 --- apt/files/bullseye_backports_preferences | 3 --- apt/files/buster_backports_preferences | 3 --- apt/files/jessie_backports_preferences | 3 --- apt/files/stretch_backports_preferences | 3 --- apt/tasks/backports.deb822.yml | 12 +----------- apt/tasks/backports.oneline.yml | 12 +----------- apt/tests/spec/main_spec.rb | 4 ---- evolinux-base/tests/spec/main_spec.rb | 4 ---- 9 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 apt/files/bookworm_backports_preferences delete mode 100644 apt/files/bullseye_backports_preferences delete mode 100644 apt/files/buster_backports_preferences delete mode 100644 apt/files/jessie_backports_preferences delete mode 100644 apt/files/stretch_backports_preferences diff --git a/apt/files/bookworm_backports_preferences b/apt/files/bookworm_backports_preferences deleted file mode 100644 index eaf76d52..00000000 --- a/apt/files/bookworm_backports_preferences +++ /dev/null @@ -1,3 +0,0 @@ -Package: * -Pin: release a=bookworm-backports -Pin-Priority: 50 diff --git a/apt/files/bullseye_backports_preferences b/apt/files/bullseye_backports_preferences deleted file mode 100644 index 3a667c93..00000000 --- a/apt/files/bullseye_backports_preferences +++ /dev/null @@ -1,3 +0,0 @@ -Package: * -Pin: release a=bullseye-backports -Pin-Priority: 50 diff --git a/apt/files/buster_backports_preferences b/apt/files/buster_backports_preferences deleted file mode 100644 index 30fef48d..00000000 --- a/apt/files/buster_backports_preferences +++ /dev/null @@ -1,3 +0,0 @@ -Package: * -Pin: release a=buster-backports -Pin-Priority: 50 diff --git a/apt/files/jessie_backports_preferences b/apt/files/jessie_backports_preferences deleted file mode 100644 index dd3cef12..00000000 --- a/apt/files/jessie_backports_preferences +++ /dev/null @@ -1,3 +0,0 @@ -Package: * -Pin: release a=jessie-backports -Pin-Priority: 50 diff --git a/apt/files/stretch_backports_preferences b/apt/files/stretch_backports_preferences deleted file mode 100644 index 6d5d03be..00000000 --- a/apt/files/stretch_backports_preferences +++ /dev/null @@ -1,3 +0,0 @@ -Package: * -Pin: release a=stretch-backports -Pin-Priority: 50 diff --git a/apt/tasks/backports.deb822.yml b/apt/tasks/backports.deb822.yml index 0382892d..db117d94 100644 --- a/apt/tasks/backports.deb822.yml +++ b/apt/tasks/backports.deb822.yml @@ -10,19 +10,9 @@ tags: - apt -- name: Backports configuration - ansible.builtin.copy: - src: '{{ ansible_distribution_release }}_backports_preferences' - dest: /etc/apt/preferences.d/0-backports-defaults - force: true - mode: "0640" - register: apt_backports_config - tags: - - apt - - name: Apt update ansible.builtin.apt: update_cache: yes - when: apt_backports_sources is changed or apt_backports_config is changed + when: apt_backports_sources is changed tags: - apt diff --git a/apt/tasks/backports.oneline.yml b/apt/tasks/backports.oneline.yml index 11de5c52..1630de19 100644 --- a/apt/tasks/backports.oneline.yml +++ b/apt/tasks/backports.oneline.yml @@ -17,16 +17,6 @@ tags: - apt -- name: Backports configuration - ansible.builtin.copy: - src: '{{ ansible_distribution_release }}_backports_preferences' - dest: /etc/apt/preferences.d/0-backports-defaults - force: true - mode: "0640" - register: apt_backports_config - tags: - - apt - - name: Archived backport are accepted (jessie) ansible.builtin.lineinfile: dest: '/etc/apt/apt.conf.d/99no-check-valid-until' @@ -42,4 +32,4 @@ update_cache: yes tags: - apt - when: apt_backports_list is changed or apt_backports_config is changed + when: apt_backports_list is changed diff --git a/apt/tests/spec/main_spec.rb b/apt/tests/spec/main_spec.rb index ff40dab9..6404b724 100644 --- a/apt/tests/spec/main_spec.rb +++ b/apt/tests/spec/main_spec.rb @@ -8,10 +8,6 @@ describe file("/etc/apt/sources.list.d/backports.list") do it { should be_file } end -describe file("/etc/apt/preferences.d/0-backports-defaults") do - it { should be_file } -end - describe command("grep 'main contrib non-free' /etc/apt/sources.list.d/backports.list") do its(:stdout) { should_not be_empty } its(:exit_status) { should eq 0 } diff --git a/evolinux-base/tests/spec/main_spec.rb b/evolinux-base/tests/spec/main_spec.rb index 30c47166..b64a9202 100644 --- a/evolinux-base/tests/spec/main_spec.rb +++ b/evolinux-base/tests/spec/main_spec.rb @@ -8,10 +8,6 @@ set :backend, :exec # it { should be_file } # end # -# describe file("/etc/apt/preferences.d/0-backports-defaults") do -# it { should be_file } -# end -# # describe command("grep 'main contrib non-free' /etc/apt/sources.list.d/backports.list") do # its(:stdout) { should_not be_empty } # its(:exit_status) { should eq 0 }