From e4ee37b30124a628c66554e9a4b2789b9f8afee3 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 29 Apr 2012 20:53:56 +0200 Subject: [PATCH] On armhf, schroot* from buildd.d.o gets a pin-priority of 700 --- modules/buildd/files/apt-preferences | 7 ------- modules/buildd/manifests/init.pp | 4 ++++ .../etc/apt/preferences.d/buildd.debian.org | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 7 deletions(-) delete mode 100644 modules/buildd/files/apt-preferences create mode 100644 modules/buildd/templates/etc/apt/preferences.d/buildd.debian.org 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 009d9931..2248409d 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -41,7 +41,11 @@ class buildd { } file { '/etc/apt/preferences.d/buildd': + ensure => absent, + } + file { '/etc/apt/preferences.d/buildd.debian.org': source => "puppet:///modules/buildd/apt-preferences", + content => template('buildd/etc/apt/preferences.d/buildd.debian.org'), before => File["/etc/apt/sources.list.d/buildd.list"], ; } diff --git a/modules/buildd/templates/etc/apt/preferences.d/buildd.debian.org b/modules/buildd/templates/etc/apt/preferences.d/buildd.debian.org new file mode 100644 index 00000000..4be1d8ea --- /dev/null +++ b/modules/buildd/templates/etc/apt/preferences.d/buildd.debian.org @@ -0,0 +1,17 @@ +<% if scope.lookupvar('site::nodeinfo')['ldap'].has_key?('architecture') and scope.lookupvar('site::nodeinfo')['ldap']['architecture'][0] == 'armhf' -%> +Package: schroot +Pin: release o=buildd.debian.org +Pin-Priority: 700 + +Package: schroot-common +Pin: release o=buildd.debian.org +Pin-Priority: 700 +<% else -%> +Package: schroot +Pin: release o=buildd.debian.org +Pin-Priority: 500 + +Package: schroot-common +Pin: release o=buildd.debian.org +Pin-Priority: 500 +<% end %> -- 2.39.2