X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=76de9f15c814642735837c75043be0ef6db0db9b;hb=90cce07abbe5e590664b552f9dfbf91fc3e2ea49;hp=fc3e21d99966bd480a34e54d1c033f78fa350e7b;hpb=1c7a4178f4687fd07825eac48ef8d2829a67719b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index fc3e21d99..76de9f15c 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,19 +1,20 @@
 class buildd {
 
-	# sigh, sort this mess out, kids
-	if $::lsbdistcodename in [lenny,squeeze] {
-		package { 'schroot':
-			ensure => installed,
-		}
-	} else {
-		// package { 'schroot': ensure => held }
+	package { [
+			'schroot',
+			'sbuild'
+		]:
+		ensure  => installed,
+		require => [
+			File['/etc/apt/sources.list.d/buildd.debian.org.list'],
+			Exec['apt-get update']
+		]
 	}
 
 	package { 'apt-transport-https':
 		ensure => installed,
 	}
 	package { [
-			'sbuild',
 			'debootstrap',
 			'dupload'
 		]:
@@ -36,14 +37,17 @@ class buildd {
 		require  => Package['apt-transport-https'],
 	}
 
-	# "bad" extension
+	# 'bad' extension
 	file { '/etc/apt/preferences.d/buildd.debian.org':
 		ensure => absent,
 	}
-	file { '/etc/apt/preferences.d/buildd.debian.org':
+	file { '/etc/apt/preferences.d':
+		ensure => directory,
+		mode   => '0755'
+	}
+	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  => File['/etc/apt/sources.list.d/buildd.debian.org.list']
 	}
 	file { '/etc/schroot/mount-defaults':
 		content => template('buildd/etc/schroot/mount-defaults.erb'),