diff options
| author | Micah Anderson <micah@riseup.net> | 2011-04-23 10:50:53 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2011-04-23 10:50:53 -0400 |
| commit | 11324d6057b78814ed54d4b69da38af3304e1c70 (patch) | |
| tree | 858ba34a68ae2ae6557d0ca933225520ef1ed97e /manifests/preferences.pp | |
| parent | 9354f09460aba2eb22ad8fd0464729a5ef9b216d (diff) | |
| parent | 5964e90e335473844f2474efe6590c0218a8e7f2 (diff) | |
| download | puppet-apt-11324d6057b78814ed54d4b69da38af3304e1c70.tar.gz puppet-apt-11324d6057b78814ed54d4b69da38af3304e1c70.tar.bz2 | |
Merge remote-tracking branch 'nadir/master'
Diffstat (limited to 'manifests/preferences.pp')
| -rw-r--r-- | manifests/preferences.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/preferences.pp b/manifests/preferences.pp index 4c93542..71ef0a6 100644 --- a/manifests/preferences.pp +++ b/manifests/preferences.pp @@ -7,7 +7,7 @@ class apt::preferences { content => $custom_preferences ? { '' => $operatingsystem ? { 'debian' => template("apt/${operatingsystem}/preferences_${codename}.erb"), - 'ubuntu' => '', + 'ubuntu' => template("apt/${operatingsystem}/preferences_${codename}.erb"), }, default => $custom_preferences }, |