diff options
| author | Gabriel Filion <lelutin@gmail.com> | 2013-01-02 07:32:12 -0500 |
|---|---|---|
| committer | Gabriel Filion <lelutin@gmail.com> | 2013-01-02 07:32:12 -0500 |
| commit | cda713fcf6bd189c3e870c9e466aa5f41d1847b6 (patch) | |
| tree | 9cf8ba23ed7255c23f3acf788f4f79f84d13e2df /manifests/upgrade_package.pp | |
| parent | d1d7f7b9bd73cfd982fe3c520f1de266c5836f8c (diff) | |
| parent | 37e5594770f4e8570f3acbb6e15ae6f0286ca379 (diff) | |
| download | puppet-apt-cda713fcf6bd189c3e870c9e466aa5f41d1847b6.tar.gz puppet-apt-cda713fcf6bd189c3e870c9e466aa5f41d1847b6.tar.bz2 | |
Merge branch 'master' into issue_3953
Diffstat (limited to 'manifests/upgrade_package.pp')
| -rw-r--r-- | manifests/upgrade_package.pp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp index 9202624..2ce6932 100644 --- a/manifests/upgrade_package.pp +++ b/manifests/upgrade_package.pp @@ -1,6 +1,8 @@ define apt::upgrade_package ($version = "") { - include apt::update + if $apt::disable_update == false { + include apt::update + } $version_suffix = $version ? { '' => '', @@ -24,10 +26,11 @@ define apt::upgrade_package ($version = "") { 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 => [ - Exec['apt_updated'], - Package['apt-show-versions', 'dctrl-tools'], - ], + require => $apt::disable_update ? { + true => Package['apt-show-versions', 'dctrl-tools'], + default => [ Exec['apt_updated'], + Package['apt-show-versions', 'dctrl-tools'] ], + } } } |