X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=289edf28ff196f2410668e2f2ae6924c42e03b19;hb=0637773c599d387da3426ac17d78cc8b0e1c8f90;hp=3c64de2e4da9526dad586b1ce7ddc532bba2e4f9;hpb=faea5a59510551386d3650c7556082974783c78f;p=mirror%2Fdsa-puppet.git diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index 3c64de2e4..289edf28f 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -85,9 +85,16 @@ class buildd ($ensure=present) { package { 'python-psutil': ensure => installed, } - file { '/usr/local/sbin/buildd-schroot-aptitude-kill': - source => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill', - mode => '0555', + if ($::lsbmajdistrelease >= 8) { + file { '/usr/local/sbin/buildd-schroot-aptitude-kill': + source => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill', + mode => '0555', + } + } else { + file { '/usr/local/sbin/buildd-schroot-aptitude-kill': + source => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill.wheezy', + mode => '0555', + } } } else { file { '/usr/local/sbin/buildd-schroot-aptitude-kill':