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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index d00197b73..3a9d5087a 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,13 +1,17 @@
 class buildd {
 
-	package { [
-			'schroot',
-			'sbuild'
-		]:
-		ensure  => installed,
-		require => [
-			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':
@@ -40,7 +44,6 @@ class buildd {
 		suite      => $suite,
 		components => 'main',
 		require    => Package['apt-transport-https'],
-		before     => Package[schroot,sbuild]
 	}
 
 	if $::hostname in [alkman,porpora,zandonai] {
@@ -67,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'),