diff options
| author | intrigeri <intrigeri@boum.org> | 2016-03-16 14:23:08 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2016-03-16 14:23:08 +0000 |
| commit | 46b2f3d2e8c9c8646dfd51280c634ce517d795e6 (patch) | |
| tree | ca4e9d9448b51b075c4c98f752c7281c636e23cb /manifests/preferences.pp | |
| parent | 3630285006d9fb60c5fbecebc976623c37dd1395 (diff) | |
| parent | 8c8bd7bb1e5cc0f5297db9629ece783452233d1f (diff) | |
Merge remote-tracking branch 'shared/master' into bugfix/reboot-required-jessie
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 } |