Simplify conditional expressions
This commit is contained in:
parent
f492e5840b
commit
4d3b720308
1 changed files with 8 additions and 10 deletions
|
@ -98,8 +98,7 @@ class apt(
|
||||||
# backports uses the normal archive key now
|
# backports uses the normal archive key now
|
||||||
package { 'debian-backports-keyring': ensure => absent }
|
package { 'debian-backports-keyring': ensure => absent }
|
||||||
|
|
||||||
if $use_backports {
|
if ($use_backports and !($::debian_release in ['testing', 'unstable', 'experimental'])) {
|
||||||
if (${::debian_release} != "testing" and ${::debian_release} != "unstable" and ${::debian_release} != "experimental") {
|
|
||||||
apt::sources_list {
|
apt::sources_list {
|
||||||
'backports':
|
'backports':
|
||||||
content => "deb $backports_url ${::debian_codename}-backports ${apt::real_repos}",
|
content => "deb $backports_url ${::debian_codename}-backports ${apt::real_repos}",
|
||||||
|
@ -111,7 +110,6 @@ class apt(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
include common::moduledir
|
include common::moduledir
|
||||||
common::module_dir { 'apt': }
|
common::module_dir { 'apt': }
|
||||||
|
|
Loading…
Reference in a new issue