phil says they still need the repo

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index b76652c1159de7990c269aec58674783a1507a10..d00197b7345852ad723db7595602cde6a670a51c 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -6,7 +6,6 @@ class buildd {
                ]:
                ensure  => installed,
                require => [
-                       File['/etc/apt/sources.list.d/buildd.debian.org.list'],
                        Exec['apt-get update']
                ]
        }
@@ -19,10 +18,6 @@ class buildd {
                        'dupload'
                ]:
                ensure => installed,
-               require => [
-                       File['/etc/apt/sources.list.d/db.debian.org.list'],
-                       Exec['apt-get update']
-               ]
        }
 
        site::linux_module { 'dm_snapshot': }
@@ -32,10 +27,11 @@ class buildd {
                ensure => absent,
        }
 
-       if $::lsbdistcodename in [squeeze,wheezy] {
-               $suite = $::lsbdistcodename
-       } else {
-               $suite = 'wheezy'
+       $suite = $::lsbdistcodename ? {
+               squeeze => $::lsbdistcodename,
+               wheezy  => $::lsbdistcodename,
+               undef   => 'squeeze',
+               default => 'wheezy'
        }
 
        site::aptrepo { 'buildd.debian.org':
@@ -44,6 +40,7 @@ class buildd {
                suite      => $suite,
                components => 'main',
                require    => Package['apt-transport-https'],
+               before     => Package[schroot,sbuild]
        }
 
        if $::hostname in [alkman,porpora,zandonai] {