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 (file)
index db8dd1f..0000000
--- 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 41efffe5840980999447e0c798659cd7b9eb8a54..a5af7bedfde513a919df9bd730a046a0f2d51877 100644 (file)
--- 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 5525c25759ce9e318e1d53d1f8510e92a350d87e..3340574af37a799bf6242e2a7e9c4d88048daf96 100644 (file)
--- 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