summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-11-21 17:03:57 +0100
committerintrigeri <intrigeri@boum.org>2010-11-21 17:03:57 +0100
commit10c7939f65ae8e2f771d83d54c4ba56108bc509e (patch)
tree4c66514e6adfece27e5111d1e296009e94405c6f /manifests
parent3de76e7b05224b9696a75908b0a4259349e20823 (diff)
parent5d54dfdd88d1e87681b317db16b20ad20b8c88f7 (diff)
Merge remote branch 'immerda/master'.
Conflicts: README files/preferences templates/Debian/sources.list.deb-src.erb templates/Debian/sources.list.volatile.erb templates/Ubuntu/sources.list.backports.erb templates/Ubuntu/sources.list.deb-src.erb
Diffstat (limited to 'manifests')
-rw-r--r--manifests/preferences_snippet.pp12
1 files changed, 7 insertions, 5 deletions
diff --git a/manifests/preferences_snippet.pp b/manifests/preferences_snippet.pp
index 9da7a8e..fd2956d 100644
--- a/manifests/preferences_snippet.pp
+++ b/manifests/preferences_snippet.pp
@@ -21,13 +21,15 @@ define apt::preferences_snippet(
# snippets, but since the preferences.d directory cannot be used in Debian
# lenny, we can't generalize without going into ugly special-casing.
case $source {
- '' =>
- File["${apt::preferences::apt_preferences_dir/${name}"] {
+ '': {
+ File["${apt::preferences::apt_preferences_dir}/${name}"] {
content => template("apt/preferences_snippet.erb")
- },
- default =>
- File["${apt::preferences::apt_preferences_dir/${name}"] {
+ }
+ }
+ default: {
+ File["${apt::preferences::apt_preferences_dir}/${name}"] {
source => $source
}
+ }
}
}