Try this

[dsa-puppet.git] / modules / buildd / manifests / init.pp

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 2248409ddaaae1115a7479fe14d18aca048166c6..e41e5ac4101105f77d7acd48a1693166235ff5fd 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -4,13 +4,9 @@ class buildd {
        if $::lsbdistcodename in [lenny,squeeze] {
                package { 'schroot':
                        ensure => installed,
-                       require => [
-                               File['/etc/apt/sources.list.d/db.debian.org.list'],
-                               Exec['apt-get update']
-                       ]
                }
        } else {
-               package { 'schroot': ensure => held }
+               package { 'schroot': }
        }
 
        package { 'apt-transport-https':
@@ -40,13 +36,13 @@ 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':
-               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"],
+       file { '/etc/apt/preferences.d/buildd':
+               content => template('buildd/etc/apt/preferences.d/buildd'),
+               before  => File["/etc/apt/sources.list.d/buildd.debian.org.list"],
                ;
        }
        file { '/etc/schroot/mount-defaults':