diff options
author | intrigeri <intrigeri@boum.org> | 2017-02-12 12:51:12 +0000 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2017-02-12 12:51:12 +0000 |
commit | 4dce28de2f702a2ec9f8855d96b49f930966ea1e (patch) | |
tree | 18f3439205b380a711d66ab643d0689142d81a73 /manifests/upgrade_package.pp | |
parent | f41eebf3cae6549b6c56874fc7fda5432f95d9a2 (diff) | |
parent | 904be827acc3cc377123544eaf401f26eb984495 (diff) |
Merge remote-tracking branch 'sogeecom/harmonize_style' into shared-master
Diffstat (limited to 'manifests/upgrade_package.pp')
-rw-r--r-- | manifests/upgrade_package.pp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp index e61b15d..3ba2077 100644 --- a/manifests/upgrade_package.pp +++ b/manifests/upgrade_package.pp @@ -1,7 +1,8 @@ # Install a package either to a certain version, or while making sure that it's # always the latest version that's installed. + define apt::upgrade_package ( - $version = '' + $version = '', ) { $version_suffix = $version ? { @@ -12,22 +13,19 @@ define apt::upgrade_package ( if !defined(Package['apt-show-versions']) { package { 'apt-show-versions': - ensure => installed, - require => undef, + ensure => present, } } if !defined(Package['dctrl-tools']) { package { 'dctrl-tools': - ensure => installed, - require => undef, + ensure => present, } } 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 => Package['apt-show-versions', 'dctrl-tools'], - before => Exec['apt_updated'] + before => Exec['update_apt']; } - } |