From 9a099c1e6505cfc2c902aa6be593d60a5f74bc1e Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 17 Jan 2012 14:50:46 +0100 Subject: [PATCH] lenny hosts do not have /etc/apt/preferences.d/ --- modules/buildd/files/apt-preferences | 7 ------- modules/buildd/manifests/init.pp | 5 ----- modules/debian-org/files/apt.preferences | 8 ++++++++ 3 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 modules/buildd/files/apt-preferences diff --git a/modules/buildd/files/apt-preferences b/modules/buildd/files/apt-preferences deleted file mode 100644 index db8dd1fc..00000000 --- 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 41efffe5..a5af7bed 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 5525c257..3340574a 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 -- 2.39.2