X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=de8091bbc6297dd27bb736bb46f3daf534b8a241;hb=3c2f2bbb9096b574da842b3c598b87bf9a8a3456;hp=bb965beac6b5e90682120e33b57361af90eff5e6;hpb=2ff27487c60b5ef050465fcc9ad7359bcf3af0af;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index bb965beac..de8091bbc 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -8,7 +8,7 @@ class debian-org {
 	} else {
 		$mirror = 'http://http.debian.net/debian/'
 	}
-	if $::lsbmajdistrelease != "testing" and $::lsbmajdistrelease < 7 {
+	if $::lsbmajdistrelease < 7 {
 		$mirror_backports = 'http://backports.debian.org/debian-backports/'
 	} else {
 		$mirror_backports = $mirror
@@ -60,7 +60,7 @@ class debian-org {
 		ensure => installed,
 	}
 
-	if $::lsbmajdistrelease == "testing" or $::lsbmajdistrelease >= 7 {
+	if $::lsbmajdistrelease >= 7 {
 		package { 'libfilesystem-ruby1.9.1':
 			ensure => installed,
 		}
@@ -122,7 +122,7 @@ class debian-org {
 		suite      => "${::lsbdistcodename}/updates",
 		components => ['main','contrib','non-free']
 	}
-	if $::lsbmajdistrelease != "testing" and $::lsbmajdistrelease < 7 {
+	if $::lsbmajdistrelease < 7 {
 		site::aptrepo { 'debian-lts':
 			url        => $mirror,
 			suite      => "${::lsbdistcodename}-lts",