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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 2248409dd..fc3e21d99 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 }
+		// package { 'schroot': ensure => held }
 	}
 
 	package { 'apt-transport-https':
@@ -40,13 +36,13 @@ class buildd {
 		require  => Package['apt-transport-https'],
 	}
 
-	file { '/etc/apt/preferences.d/buildd':
+	# "bad" extension
+	file { '/etc/apt/preferences.d/buildd.debian.org':
 		ensure => absent,
 	}
 	file { '/etc/apt/preferences.d/buildd.debian.org':
-		source  => "puppet:///modules/buildd/apt-preferences",
-		content => template('buildd/etc/apt/preferences.d/buildd.debian.org'),
-		before  => File["/etc/apt/sources.list.d/buildd.list"],
+		content => template('buildd/etc/apt/preferences.d/buildd'),
+		before  => File["/etc/apt/sources.list.d/buildd.debian.org.list"],
 		;
 	}
 	file { '/etc/schroot/mount-defaults':