aboutsummaryrefslogtreecommitdiff
path: root/manifests/preferences.pp
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-08-26 12:06:55 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-08-26 12:06:55 -0300
commitd6f2f1e575956d460917ee546d68ac16064e9f72 (patch)
treee5e8271059559be09e2393ba797e02238dfd8edd /manifests/preferences.pp
parentdce0def52a74bfad08f99dafd92f21021bbbac29 (diff)
parent546b5cbdbcfd7551e769a0fc8a7a568f04ead3a9 (diff)
downloadpuppet-apt-d6f2f1e575956d460917ee546d68ac16064e9f72.tar.gz
puppet-apt-d6f2f1e575956d460917ee546d68ac16064e9f72.tar.bz2
Merge branch 'master' of git://labs.riseup.net/shared-apt
Diffstat (limited to 'manifests/preferences.pp')
-rw-r--r--manifests/preferences.pp2
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
},