From: carabasdaniel <daniel.carabas@puppet.com>
Date: Thu, 13 Feb 2020 07:52:25 +0000 (+0200)
Subject: Merge pull request #904 from anarcat/sources-list-remove
X-Git-Tag: v7.4.0~6
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a2af17f31baf17817c0acf2820100f5ee4e6ae47;hp=b4ff0238dab5b8ead42b686bd27c2be714088ff1;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #904 from anarcat/sources-list-remove

MODULES-10543: remove sources.list file on purging
---

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':