Merge branch 'fix-dist-upgrade' of https://github.com/ypid/debops-pla…

…ybooks into ypid-fix-dist-upgrade
debops · Sep 23, 2017 · 995a8a0 · 995a8a0
2 parents e00c115 + fc19ca5
commit 995a8a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -233,6 +233,13 @@ Fixed
   Ansible 2.1. This is a non-backwards compatible change and it breaks
   compatibility with Ansible 2.0. [anzil]
 
+- Fix compatibility of :file:`playbooks/tools/dist-upgrade.yml` and
+  ``apt_preferences__debian_stable_default_preset_list``.
+  Previously,
+  :file:`/etc/apt/preferences.d/debops_apt_preferences_all_Debian.pref` might
+  not have been removed resulting in packages from backports getting installed
+  during the upgrade. [ypid_]
+
 Security
 ~~~~~~~~
 

diff --git a/playbooks/tools/dist-upgrade.yml b/playbooks/tools/dist-upgrade.yml
@@ -105,7 +105,7 @@
 
     - name: Remove all APT preferences for backported packages
       shell: >
-              grep -lrIZ 'Pin: release a={{ dist_upgrade_current_release }}-backports' /etc/apt/preferences.d | xargs -0 rm -f --
+              grep -lrIZ 'Pin: release .*={{ dist_upgrade_current_release }}-backports' /etc/apt/preferences.d | xargs -0 rm -f --
       when: dist_upgrade_register_replace is defined and dist_upgrade_register_replace|changed
 
     - name: Create a lockfile