From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat, 18 Mar 2017 21:39:57 +0000 (+0100)
Subject: Remove wheezy support in schroot files
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=d4f9fe9388672de97c70563b056af1980b18e614;hp=6ca9dea6fb2f84ed9352e7af980a59007580e6c9;p=mirror%2Fdsa-puppet.git

Remove wheezy support in schroot files

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/modules/schroot/manifests/init.pp b/modules/schroot/manifests/init.pp
index 14bb91455..7c5e00896 100644
--- a/modules/schroot/manifests/init.pp
+++ b/modules/schroot/manifests/init.pp
@@ -33,12 +33,10 @@ class schroot {
 		source  => 'puppet:///modules/schroot/schroot-setup.d/99porterbox-extra-sources',
 		require => Package['schroot'],
 	}
-	if ($::lsbmajdistrelease >= 8) {
-		file { '/etc/schroot/setup.d/99builddsourceslist':
-			mode    => '0555',
-			source  => 'puppet:///modules/schroot/schroot-setup.d/99builddsourceslist',
-			require => Package['schroot'],
-		}
+	file { '/etc/schroot/setup.d/99builddsourceslist':
+		mode    => '0555',
+		source  => 'puppet:///modules/schroot/schroot-setup.d/99builddsourceslist',
+		require => Package['schroot'],
 	}
 
 	file { '/usr/local/sbin/setup-dchroot':