From d2f41d6cc64287591ac5c97a1fae9adb4f848d36 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Tue, 1 Jan 2013 20:01:55 +0000 Subject: [PATCH] drop out buildd apt repo for wheezy Signed-off-by: Stephen Gran --- modules/buildd/manifests/init.pp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) 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] { -- 2.20.1