diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-31 14:50:07 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-31 14:50:07 -0300 |
| commit | b65996f7ae03d2bae118855a3c4d94a3947e556d (patch) | |
| tree | 5bab8e5c3663aaabca34ebcee3c706c4fbc35cb5 /manifests/upgrade_package.pp | |
| parent | b0425c65ecc61c6af3f31fba577b1e1c5d880674 (diff) | |
| parent | 8c8bd7bb1e5cc0f5297db9629ece783452233d1f (diff) | |
| download | puppet-apt-b65996f7ae03d2bae118855a3c4d94a3947e556d.tar.gz puppet-apt-b65996f7ae03d2bae118855a3c4d94a3947e556d.tar.bz2 | |
Conflicts:
README
files/Debian/50unattended-upgrades.lenny
files/Debian/50unattended-upgrades.wheezy
manifests/init.pp
manifests/params.pp
manifests/unattended_upgrades.pp
templates/Debian/preferences_jessie.erb
templates/Debian/sources.list.erb
Diffstat (limited to 'manifests/upgrade_package.pp')
| -rw-r--r-- | manifests/upgrade_package.pp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp index d607150..30572c9 100644 --- a/manifests/upgrade_package.pp +++ b/manifests/upgrade_package.pp @@ -2,10 +2,6 @@ define apt::upgrade_package ( $version = '' ) { - if $apt::disable_update == false { - include apt::update - } - $version_suffix = $version ? { '' => '', '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}": 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'] } } |