From 1859c946d18a89268be63316be4e1e6f9673ff66 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Antoine=20Beaupr=C3=A9?= Date: Tue, 11 Feb 2020 11:40:06 -0500 Subject: [PATCH] MODULES-10543: remove sources.list file on purging The current sources.list purge behavior is inconsistent with the preferences behavior. The former creates a file with a comment, the latter removes the file. This harmonizes this behavior between the two files and simply drops the file if it is to be purged. --- manifests/init.pp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index b21ce12..3995534 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -204,9 +204,9 @@ class apt ( } } - $sources_list_content = $_purge['sources.list'] ? { - true => "# Repos managed by puppet.\n", - default => undef, + $sources_list_ensure = $_purge['sources.list'] ? { + true => absent, + default => file, } $preferences_ensure = $_purge['preferences'] ? { @@ -226,13 +226,12 @@ class apt ( } file { 'sources.list': - ensure => file, - path => $::apt::sources_list, - owner => root, - group => root, - mode => '0644', - content => $sources_list_content, - notify => Class['apt::update'], + ensure => $sources_list_ensure, + path => $::apt::sources_list, + owner => root, + group => root, + mode => '0644', + notify => Class['apt::update'], } file { 'sources.list.d': -- 2.45.2