Revert "lenny hosts do not have /etc/apt/preferences.d/"

This reverts commit 9a099c1e6505cfc2c902aa6be593d60a5f74bc1e.

Conflicts:

	modules/buildd/manifests/init.pp

diff --git a/modules/buildd/files/apt-preferences b/modules/buildd/files/apt-preferences
new file mode 100644 (file)
index 0000000..db8dd1f
--- /dev/null
+++ b/modules/buildd/files/apt-preferences
@@ -0,0 +1,7 @@
+Package: schroot
+Pin: release o=buildd.debian.org
+Pin-Priority: 500
+
+Package: schroot-common
+Pin: release o=buildd.debian.org
+Pin-Priority: 500

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 161238b400cde7dcf4a440b391711dc52eeb7615..009d99313b2db37c31c12af1dfc653fdbd7dceae 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -41,7 +41,9 @@ class buildd {
        }
 
        file { '/etc/apt/preferences.d/buildd':
-               ensure  => absent
+               source  => "puppet:///modules/buildd/apt-preferences",
+               before  => File["/etc/apt/sources.list.d/buildd.list"],
+               ;
        }
        file { '/etc/schroot/mount-defaults':
                content => template('buildd/etc/schroot/mount-defaults.erb'),

diff --git a/modules/debian-org/files/apt.preferences b/modules/debian-org/files/apt.preferences
index c986dca8681c351c7d721b628deb4ad7c4544b36..da5c766ee9fe4d93c1853a2e8b3d0d06d03b8507 100644 (file)
--- a/modules/debian-org/files/apt.preferences
+++ b/modules/debian-org/files/apt.preferences
@@ -26,14 +26,6 @@ Package: libsbuild-perl
 Pin: release o=buildd.debian.org
 Pin-Priority: 500
 
-Package: schroot
-Pin: release o=buildd.debian.org
-Pin-Priority: 500
-
-Package: schroot-common
-Pin: release o=buildd.debian.org
-Pin-Priority: 500
-
 Package: *
 Pin: release o=buildd.debian.org
 Pin-Priority: -1