X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=335da3f012bbbf9936923da858e6a844326ec9cf;hb=551d65d18436977c93a2ba7f4aa985a42bb41315;hp=b76652c1159de7990c269aec58674783a1507a10;hpb=9573712862a431d238cf67894f4b422794eaa78f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index b76652c11..335da3f01 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -19,10 +19,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 +28,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':