X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fbackports.pp;h=1b9cabbaf10ff062d868f86f4dd6331380ee5b4b;hb=d7b00b12480a48128159e0dd8aa4f2ae3b6f8fd6;hp=a93e14f37eea07a2b64e4f123e168fe01a27e1c9;hpb=6c1fd8e819cc8ffb44ac187bb0fa7051d2958cc6;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/backports.pp b/manifests/backports.pp index a93e14f..1b9cabb 100644 --- a/manifests/backports.pp +++ b/manifests/backports.pp @@ -52,6 +52,9 @@ class apt::backports ( Optional[Variant[String, Hash]] $key = undef, Optional[Variant[Integer, String, Hash]] $pin = 200, ){ + + include apt + if $location { $_location = $location } @@ -64,24 +67,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 +95,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':