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/preferences.pp | |
parent | b0425c65ecc61c6af3f31fba577b1e1c5d880674 (diff) | |
parent | 8c8bd7bb1e5cc0f5297db9629ece783452233d1f (diff) | |
download | puppet-apt-master.tar.gz puppet-apt-master.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/preferences.pp')
-rw-r--r-- | manifests/preferences.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/preferences.pp b/manifests/preferences.pp index 9ed24c1..6982ca0 100644 --- a/manifests/preferences.pp +++ b/manifests/preferences.pp @@ -2,8 +2,8 @@ class apt::preferences { $pref_contents = $apt::custom_preferences ? { '' => $::operatingsystem ? { - 'debian' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"), - 'ubuntu' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"), + 'debian' => template("apt/${::operatingsystem}/preferences_${::debian_codename}.erb"), + 'ubuntu' => template("apt/${::operatingsystem}/preferences_${::ubuntu_codename}.erb"), }, default => $apt::custom_preferences } |