From c8ec38cb0dd5fe062b3597140a1bab01729c109a Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 11 Sep 2019 13:38:43 +0200 Subject: [PATCH] Remove the pkglist fact. It's a) unused and b) slightly buggy --- modules/debian_org/files/apt.conf.d/local-pkglist | 6 ------ modules/debian_org/lib/facter/pkglist.rb | 9 --------- modules/debian_org/manifests/apt.pp | 2 +- 3 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 modules/debian_org/files/apt.conf.d/local-pkglist delete mode 100644 modules/debian_org/lib/facter/pkglist.rb diff --git a/modules/debian_org/files/apt.conf.d/local-pkglist b/modules/debian_org/files/apt.conf.d/local-pkglist deleted file mode 100644 index 4cf907c99..000000000 --- a/modules/debian_org/files/apt.conf.d/local-pkglist +++ /dev/null @@ -1,6 +0,0 @@ -// -// THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -// USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git -// - -DPkg::Post-Invoke { "cd /var/lib/misc/thishost/ ; dpkg-query -W -f '${Package}\n' > pkglist.tmp ; mv pkglist.tmp pkglist"; }; diff --git a/modules/debian_org/lib/facter/pkglist.rb b/modules/debian_org/lib/facter/pkglist.rb deleted file mode 100644 index 2609d4073..000000000 --- a/modules/debian_org/lib/facter/pkglist.rb +++ /dev/null @@ -1,9 +0,0 @@ -pkglist = '/var/lib/misc/thishost/pkglist' - -if FileTest.exist?(pkglist) - Facter.add('pkglist') do - setcode do - open(pkglist).read().split("\n").join(' ') - end - end -end diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp index ea61ba09e..4f31eba0c 100644 --- a/modules/debian_org/manifests/apt.pp +++ b/modules/debian_org/manifests/apt.pp @@ -105,7 +105,7 @@ class debian_org::apt { source => 'puppet:///modules/debian_org/apt.conf.d/local-cainfo', } file { '/etc/apt/apt.conf.d/local-pkglist': - source => 'puppet:///modules/debian_org/apt.conf.d/local-pkglist', + ensure => 'absent', } exec { 'dpkg list': -- 2.20.1