diff options
| author | Micah Anderson <micah@riseup.net> | 2011-02-28 15:02:08 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2011-02-28 15:02:08 -0500 |
| commit | 36ba260d87692847fb5b727fe301e8b3d4988fd3 (patch) | |
| tree | bdc60fab89fd08661ef6bfdcee99201b0ac0de3b | |
| parent | 64494abad761e4781ac0dd730e7948feadcd65e6 (diff) | |
debian's puppet depends on puppet-common, but if you were to set
$puppet_ensure_version to a backported version and your pinning was setup so
that you dont pull any packages unless explicit (I believe this is the default),
then you will end up seeing things like this:
The following packages have unmet dependencies:
puppet: Depends: puppet-common (= 2.6.2-4~bpo50+1) but 2.6.2-1~bpo50+1 is to be installed
E: Broken packages
at /etc/puppet/modules/puppet/manifests/linux.pp:6
this commit adds the $puppet_ensure_version test in debian.pp to make sure that
the puppet-common package is also following this request
| -rw-r--r-- | manifests/debian.pp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index 4adc8c9..690c7c5 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -21,6 +21,11 @@ class puppet::debian inherits puppet::linux { Service[puppet]{ hasstatus => $real_puppet_hasstatus, } + + if !$puppet_ensure_version { $puppet_ensure_version = 'installed' } + package{ 'puppet-common': + ensure => $puppet_ensure_version, + } } |