[refactor] Get rid of the disable_update parameter
The `disable_update` parameter has been removed. The main apt class defaults to *not* run an `apt-get update` on every run anyway so this parameter seems useless. You can include the `apt::update` class if you want it to be run every time.
This commit is contained in:
parent
d2ae98e89b
commit
207218cee8
3 changed files with 2 additions and 15 deletions
|
@ -18,7 +18,6 @@ class apt(
|
||||||
$repos = $apt::params::repos,
|
$repos = $apt::params::repos,
|
||||||
$custom_preferences = $apt::params::custom_preferences,
|
$custom_preferences = $apt::params::custom_preferences,
|
||||||
$custom_sources_list = '',
|
$custom_sources_list = '',
|
||||||
$disable_update = $apt::params::disable_update,
|
|
||||||
$custom_key_dir = $apt::params::custom_key_dir
|
$custom_key_dir = $apt::params::custom_key_dir
|
||||||
) inherits apt::params {
|
) inherits apt::params {
|
||||||
case $::operatingsystem {
|
case $::operatingsystem {
|
||||||
|
|
|
@ -18,6 +18,5 @@ class apt::params () {
|
||||||
$volatile_url = 'http://volatile.debian.org/debian-volatile/'
|
$volatile_url = 'http://volatile.debian.org/debian-volatile/'
|
||||||
$repos = 'auto'
|
$repos = 'auto'
|
||||||
$custom_preferences = ''
|
$custom_preferences = ''
|
||||||
$disable_update = false
|
|
||||||
$custom_key_dir = false
|
$custom_key_dir = false
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,10 +2,6 @@ define apt::upgrade_package (
|
||||||
$version = ''
|
$version = ''
|
||||||
) {
|
) {
|
||||||
|
|
||||||
if $apt::disable_update == false {
|
|
||||||
include apt::update
|
|
||||||
}
|
|
||||||
|
|
||||||
$version_suffix = $version ? {
|
$version_suffix = $version ? {
|
||||||
'' => '',
|
'' => '',
|
||||||
'latest' => '',
|
'latest' => '',
|
||||||
|
@ -26,17 +22,10 @@ define apt::upgrade_package (
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$req = $apt::disable_update ? {
|
|
||||||
true => Package['apt-show-versions', 'dctrl-tools'],
|
|
||||||
default => [
|
|
||||||
Exec['apt_updated'],
|
|
||||||
Package['apt-show-versions', 'dctrl-tools']
|
|
||||||
],
|
|
||||||
}
|
|
||||||
|
|
||||||
exec { "apt-get -q -y -o 'DPkg::Options::=--force-confold' install ${name}${version_suffix}":
|
exec { "apt-get -q -y -o 'DPkg::Options::=--force-confold' install ${name}${version_suffix}":
|
||||||
onlyif => [ "grep-status -F Status installed -a -P $name -q", "apt-show-versions -u $name | grep -q upgradeable" ],
|
onlyif => [ "grep-status -F Status installed -a -P $name -q", "apt-show-versions -u $name | grep -q upgradeable" ],
|
||||||
require => $req
|
require => Package['apt-show-versions', 'dctrl-tools'],
|
||||||
|
before => Exec['apt_updated']
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue