X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=c9af7e6d4eeceb157c6261f79e696533611ecb6a;hb=90a02692e150402b46ed74a4684feb01f719bce6;hp=161238b400cde7dcf4a440b391711dc52eeb7615;hpb=462359acbb50393c48ff0c4ffd7b3a210b866636;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 161238b40..c9af7e6d4 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -4,13 +4,9 @@ class buildd {
 	if $::lsbdistcodename in [lenny,squeeze] {
 		package { 'schroot':
 			ensure => installed,
-			require => [
-				File['/etc/apt/sources.list.d/db.debian.org.list'],
-				Exec['apt-get update']
-			]
 		}
-	} else {
-		package { 'schroot': ensure => held }
+	#} else {
+	#	package { 'schroot': ensure => held }
 	}
 
 	package { 'apt-transport-https':
@@ -40,8 +36,14 @@ class buildd {
 		require  => Package['apt-transport-https'],
 	}
 
+	# "bad" extension
+	file { '/etc/apt/preferences.d/buildd.debian.org':
+		ensure => absent,
+	}
 	file { '/etc/apt/preferences.d/buildd':
-		ensure  => absent
+		content => template('buildd/etc/apt/preferences.d/buildd'),
+		before  => File["/etc/apt/sources.list.d/buildd.debian.org.list"],
+		;
 	}
 	file { '/etc/schroot/mount-defaults':
 		content => template('buildd/etc/schroot/mount-defaults.erb'),