release prep 7.0.0

[puppet-modules/puppetlabs-apt.git] / manifests / backports.pp

diff --git a/manifests/backports.pp b/manifests/backports.pp
index a93e14f37eea07a2b64e4f123e168fe01a27e1c9..0fa69586e78089a3e38a867b59b2e4ffcc0be79c 100644 (file)
--- a/manifests/backports.pp
+++ b/manifests/backports.pp
@@ -64,24 +64,23 @@ class apt::backports (
   if $key {
     $_key = $key
   }
-  if ($facts['lsbdistid'] == 'Debian' or $facts['lsbdistid'] == 'Ubuntu') {
-    unless $location {
-      $_location = $::apt::backports['location']
-    }
-    unless $release {
-      $_release = "${facts['lsbdistcodename']}-backports"
-    }
-    unless $repos {
-      $_repos = $::apt::backports['repos']
-    }
-    unless $key {
-      $_key =  $::apt::backports['key']
-    }
-  } else {
+  if (!($facts['lsbdistid'] == 'Debian' or $facts['lsbdistid'] == 'Ubuntu')) {
     unless $location and $release and $repos and $key {
-      fail('If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key')
+      fail(translate('If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key'))
     }
   }
+  unless $location {
+    $_location = $::apt::backports['location']
+  }
+  unless $release {
+    $_release = "${facts['lsbdistcodename']}-backports"
+  }
+  unless $repos {
+    $_repos = $::apt::backports['repos']
+  }
+  unless $key {
+    $_key =  $::apt::backports['key']
+  }
 
   if $pin =~ Hash {
     $_pin = $pin
@@ -93,7 +92,7 @@ class apt::backports (
       'release'  => $_release,
     }
   } else {
-    fail('pin must be either a string, number or hash')
+    fail(translate('pin must be either a string, number or hash'))
   }
 
   apt::source { 'backports':