Explorar o código

Fix version check on 16.04.

The old test obviously broke on 16.04. Switch to using versioncmp
since it does the right thing for us.
Tim Bishop %!s(int64=8) %!d(string=hai) anos
pai
achega
1f444343b4
Modificáronse 1 ficheiros con 1 adicións e 4 borrados
  1. 1 4
      manifests/ppa.pp

+ 1 - 4
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 {