Remove the pkglist fact. It's a) unused and b) slightly buggy
authorPeter Palfrader <peter@palfrader.org>
Wed, 11 Sep 2019 11:38:43 +0000 (13:38 +0200)
committerPeter Palfrader <peter@palfrader.org>
Wed, 11 Sep 2019 11:38:43 +0000 (13:38 +0200)
modules/debian_org/files/apt.conf.d/local-pkglist [deleted file]
modules/debian_org/lib/facter/pkglist.rb [deleted file]
modules/debian_org/manifests/apt.pp

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 (file)
index 4cf907c..0000000
+++ /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 (file)
index 2609d40..0000000
+++ /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
index ea61ba0..4f31eba 100644 (file)
@@ -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':