diff options
| author | varac <varacanero@zeromail.org> | 2016-11-04 14:39:23 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-11-04 14:39:23 +0100 |
| commit | 5d001efb65f4ac2afa39d17b7b62d4f861f450a3 (patch) | |
| tree | 88b282297150f4890fce19182206dc9bfa0f3a9d /manifests/preferences.pp | |
| parent | 33c61e8df59db1abbed379a9e9790946060a8f1e (diff) | |
| parent | 584b7aad338206026d62d846122e6bef532a2d2a (diff) | |
Merge remote-tracking branch 'shared/master' into leap_master
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 6982ca0..aedd56b 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_${::debian_codename}.erb"), - 'ubuntu' => template("apt/${::operatingsystem}/preferences_${::ubuntu_codename}.erb"), + 'debian' => template("apt/${::operatingsystem}/preferences.erb"), + 'ubuntu' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"), }, default => $apt::custom_preferences } |