opuppet/module-puppetlabs-apt
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix version check on 16.04.

Browse source 
The old test obviously broke on 16.04. Switch to using versioncmp
since it does the right thing for us.
This commit is contained in:
Tim Bishop 2016-04-27 16:26:25 +01:00
parent e9925384e2
commit 1f444343b4
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
manifests/ppa.pp
View file

@ -14,10 +14,7 @@ define apt::ppa(
fail('apt::ppa is not currently supported on Debian.') fail('apt::ppa is not currently supported on Debian.')
} }
$ubuntu_release_year = regsubst($::apt::xfacts['lsbdistrelease'], '\.\d+$', '', 'G') + 0 if versioncmp($::apt::xfacts['lsbdistrelease'], '15.10') >= 0 {
$ubuntu_release_month = regsubst($::apt::xfacts['lsbdistrelease'], '^\d+\.', '', 'G') + 0
if $ubuntu_release_year >= 15 and $ubuntu_release_month >= 10 {
$distid = downcase($::apt::xfacts['lsbdistid']) $distid = downcase($::apt::xfacts['lsbdistid'])
$filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-${distid}-\\2-${release}") $filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-${distid}-\\2-${release}")
} else { } else {