X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fppa.pp;h=dfa3d08dd6235e55c12d10b83e465399980b152c;hb=459f5158795c25056306a7f51f1cf265bce6895e;hp=7069e2ed09949dde0666a746a30d758e8f5bbb68;hpb=a02654e36ca0cec2fa8360d0f52d34801df9229a;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/ppa.pp b/manifests/ppa.pp index 7069e2e..dfa3d08 100644 --- a/manifests/ppa.pp +++ b/manifests/ppa.pp @@ -14,10 +14,7 @@ define apt::ppa( fail('apt::ppa is not currently supported on Debian.') } - $ubuntu_release_year = regsubst($::apt::xfacts['lsbdistrelease'], '\.\d+$', '', 'G') + 0 - $ubuntu_release_month = regsubst($::apt::xfacts['lsbdistrelease'], '^\d+\.', '', 'G') + 0 - - if $ubuntu_release_year >= 15 and $ubuntu_release_month >= 10 { + if versioncmp($::apt::xfacts['lsbdistrelease'], '15.10') >= 0 { $distid = downcase($::apt::xfacts['lsbdistid']) $filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-${distid}-\\2-${release}") } else {