From 90c45cfe446588345eb5d9061ea359d121db2dc3 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 28 Oct 2010 22:05:37 +0200 Subject: put the file at the right place & fix typos --- files/preferences_snippet.erb | 4 ---- manifests/preferences_snippet.pp | 12 +++++++----- templates/preferences_snippet.erb | 4 ++++ 3 files changed, 11 insertions(+), 9 deletions(-) delete mode 100644 files/preferences_snippet.erb create mode 100644 templates/preferences_snippet.erb diff --git a/files/preferences_snippet.erb b/files/preferences_snippet.erb deleted file mode 100644 index 4dfb701..0000000 --- a/files/preferences_snippet.erb +++ /dev/null @@ -1,4 +0,0 @@ -Package: <%= name %> -Pin: release a=<%= release %> -Pin-Priority: <%= priority %> - 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 } + } } } diff --git a/templates/preferences_snippet.erb b/templates/preferences_snippet.erb new file mode 100644 index 0000000..4dfb701 --- /dev/null +++ b/templates/preferences_snippet.erb @@ -0,0 +1,4 @@ +Package: <%= name %> +Pin: release a=<%= release %> +Pin-Priority: <%= priority %> + -- cgit v1.2.3