clean up aptrepo ordering

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index c17096326af5dd407a25319c601072e6644b82e4..efde37bde3198b416226c095ce8c592841305465 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']
                ]
        }
@@ -28,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':
@@ -66,7 +66,7 @@ class buildd {
        }
        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']
+               before  => Site::Aptrepo['buildd.debian.org']
        }
        file { '/etc/schroot/mount-defaults':
                content => template('buildd/etc/schroot/mount-defaults.erb'),