*sigh*

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index bdb29eb8593b14faecfc72322b155111ed3b9394..7dded5ea79380ce5733e9042ac679824bda19a80 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -40,11 +40,12 @@ class buildd {
                require  => Package['apt-transport-https'],
        }
 
-       file { '/etc/apt/preferences.d/buildd':
+       # "bad" extension
+       file { '/etc/apt/preferences.d/buildd.debian.org':
                ensure => absent,
        }
        file { '/etc/apt/preferences.d/buildd.debian.org':
-               content => template('buildd/etc/apt/preferences.d/buildd.debian.org'),
+               content => template('buildd/etc/apt/preferences.d/buildd'),
                before  => File["/etc/apt/sources.list.d/buildd.debian.org.list"],
                ;
        }

diff --git a/modules/buildd/templates/etc/apt/preferences.d/buildd b/modules/buildd/templates/etc/apt/preferences.d/buildd
new file mode 100644 (file)
index 0000000..4be1d8e
--- /dev/null
+++ b/modules/buildd/templates/etc/apt/preferences.d/buildd
@@ -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 %>

diff --git a/modules/buildd/templates/etc/apt/preferences.d/buildd.debian.org b/modules/buildd/templates/etc/apt/preferences.d/buildd.debian.org
deleted file mode 100644 (file)
index 4be1d8e..0000000
--- a/modules/buildd/templates/etc/apt/preferences.d/buildd.debian.org
+++ /dev/null
@@ -1,17 +0,0 @@
-<% 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 %>