From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 17 Jan 2012 13:50:46 +0000 (+0100)
Subject: lenny hosts do not have /etc/apt/preferences.d/
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=9a099c1e6505cfc2c902aa6be593d60a5f74bc1e;p=mirror%2Fdsa-puppet.git

lenny hosts do not have /etc/apt/preferences.d/
---

diff --git a/modules/buildd/files/apt-preferences b/modules/buildd/files/apt-preferences
deleted file mode 100644
index db8dd1fce..000000000
--- a/modules/buildd/files/apt-preferences
+++ /dev/null
@@ -1,7 +0,0 @@
-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 41efffe58..a5af7bedf 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -10,11 +10,6 @@ class buildd {
     }
    
     file {
-        "/etc/apt/preferences.d/buildd":
-             source  => "puppet:///modules/buildd/apt-preferences",
-             before  => File["/etc/apt/sources.list.d/buildd.list"],
-             ;
-
         "/etc/apt/sources.list.d/buildd.list":
              content => template("buildd/etc/apt/sources.list.d/buildd.list.erb"),
              require => Package["apt-transport-https"],
diff --git a/modules/debian-org/files/apt.preferences b/modules/debian-org/files/apt.preferences
index 5525c2575..3340574af 100644
--- a/modules/debian-org/files/apt.preferences
+++ b/modules/debian-org/files/apt.preferences
@@ -22,6 +22,14 @@ 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