From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 29 Apr 2012 18:49:17 +0000 (+0200)
Subject: Revert "lenny hosts do not have /etc/apt/preferences.d/"
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d46d8acfa891b910b43074a53d410a9c9590b604;p=mirror%2Fdsa-puppet.git

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
index 000000000..db8dd1fce
--- /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 161238b40..009d99313 100644
--- 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 c986dca86..da5c766ee 100644
--- 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