Skip to content

Commit 776d7b4

Browse files
committed
Drop Ubuntu pre 18.04 specialcases
Support for 16.04 was removed in 7afbf7e Support for 14.04 was removed in 62f6ec1
1 parent fef1106 commit 776d7b4

File tree

3 files changed

+7
-17
lines changed

3 files changed

+7
-17
lines changed

manifests/init.pp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -394,9 +394,7 @@
394394
stdlib::ensure_packages(['gnupg'])
395395
}
396396
'Ubuntu': {
397-
if versioncmp($facts['os']['release']['full'], '17.04') >= 0 {
398-
stdlib::ensure_packages(['gnupg'])
399-
}
397+
stdlib::ensure_packages(['gnupg'])
400398
}
401399
default: {
402400
# Nothing in here

manifests/key.pp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,8 @@
6868
Apt::Key<| title == $title |>
6969
}
7070
'Ubuntu': {
71-
if versioncmp($facts['os']['release']['full'], '17.04') >= 0 {
72-
stdlib::ensure_packages(['gnupg'])
73-
Apt::Key<| title == $title |>
74-
}
71+
stdlib::ensure_packages(['gnupg'])
72+
Apt::Key<| title == $title |>
7573
}
7674
default: {
7775
# Nothing in here

manifests/ppa.pp

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,9 @@
4444
fail("Invalid PPA name: ${name}")
4545
}
4646

47-
if versioncmp($facts['os']['release']['full'], '14.10') >= 0 {
48-
$distid = downcase($dist)
49-
$dash_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-${distid}-\\2")
50-
$underscore_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1_${distid}_\\2")
51-
} else {
52-
$dash_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-\\2")
53-
$underscore_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1_\\2")
54-
}
47+
$distid = downcase($dist)
48+
$dash_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-${distid}-\\2")
49+
$underscore_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1_${distid}_\\2")
5550

5651
$dash_filename_no_slashes = regsubst($dash_filename, '/', '-', 'G')
5752
$dash_filename_no_specialchars = regsubst($dash_filename_no_slashes, '[\.\+]', '_', 'G')
@@ -60,8 +55,7 @@
6055

6156
$sources_list_d_filename = "${dash_filename_no_specialchars}-${release}.list"
6257

63-
if versioncmp($facts['os']['release']['full'], '15.10') >= 0 and
64-
versioncmp($facts['os']['release']['full'], '21.04') < 0 {
58+
if versioncmp($facts['os']['release']['full'], '21.04') < 0 {
6559
$trusted_gpg_d_filename = "${underscore_filename_no_specialchars}.gpg"
6660
} else {
6761
$trusted_gpg_d_filename = "${dash_filename_no_specialchars}.gpg"

0 commit comments

Comments
 (0)