X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=3a9d5087aa50b6d306cc038340f6b9b7a1605789;hb=81a0b3f9c1e1418c77a5cc7ef84fffa2d7b46fa9;hp=c17096326af5dd407a25319c601072e6644b82e4;hpb=8fa5541a03dc672caa652c35c6e82a3928b388c1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index c17096326..3a9d5087a 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,14 +1,17 @@
 class buildd {
 
-	package { [
-			'schroot',
-			'sbuild'
-		]:
-		ensure  => installed,
-		require => [
-			File['/etc/apt/sources.list.d/buildd.debian.org.list'],
-			Exec['apt-get update']
-		]
+	package { 'schroot':
+		ensure => installed,
+		tag    => extra_repo,
+	}
+	package { 'sbuild':
+		ensure => installed,
+		tag    => extra_repo,
+	}
+	package { 'libsbuild-perl':
+		ensure => installed,
+		tag    => extra_repo,
+		before => Package['sbuild']
 	}
 
 	package { 'apt-transport-https':
@@ -28,10 +31,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 +70,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'),