X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=4ded440f79d2dc5214722c51c4d6a354d777c99d;hb=d2f41d6cc64287591ac5c97a1fae9adb4f848d36;hp=335da3f012bbbf9936923da858e6a844326ec9cf;hpb=9e0f33aa915a7125ddccb463ac57a6281d18b4b3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 335da3f01..4ded440f7 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -6,7 +6,6 @@ class buildd {
 		]:
 		ensure  => installed,
 		require => [
-			File['/etc/apt/sources.list.d/buildd.debian.org.list'],
 			Exec['apt-get update']
 		]
 	}
@@ -30,17 +29,20 @@ class buildd {
 
 	$suite = $::lsbdistcodename ? {
 		squeeze => $::lsbdistcodename,
-		wheezy => $::lsbdistcodename,
-		undef => 'squeeze',
+		wheezy  => $::lsbdistcodename,
+		undef   => 'squeeze',
 		default => 'wheezy'
 	}
 
-	site::aptrepo { 'buildd.debian.org':
-		key        => 'puppet:///modules/buildd/buildd.debian.org.asc',
-		url        => 'https://buildd.debian.org/apt/',
-		suite      => $suite,
-		components => 'main',
-		require    => Package['apt-transport-https'],
+	if $suite == 'squeeze' {
+		site::aptrepo { 'buildd.debian.org':
+			key        => 'puppet:///modules/buildd/buildd.debian.org.asc',
+			url        => 'https://buildd.debian.org/apt/',
+			suite      => $suite,
+			components => 'main',
+			require    => Package['apt-transport-https'],
+			before     => Package[schroot,sbuild]
+		}
 	}
 
 	if $::hostname in [alkman,porpora,zandonai] {