aboutsummaryrefslogtreecommitdiff
path: root/manifests/preferences
diff options
context:
space:
mode:
authorGabriel Filion <lelutin@gmail.com>2010-10-25 12:17:50 -0400
committerGabriel Filion <lelutin@gmail.com>2010-10-25 14:15:12 -0400
commit4ebb7d463ed6e85a715f0a311378bf673a907042 (patch)
treee5635c1b42e2e1f71643126c0c58a55db29adeee /manifests/preferences
parent26714ae4d2992c85082ec37e6c40d725d097f79a (diff)
downloadpuppet-apt-4ebb7d463ed6e85a715f0a311378bf673a907042.tar.gz
puppet-apt-4ebb7d463ed6e85a715f0a311378bf673a907042.tar.bz2
Fix apt::preferences::absent
Currently, setting the $custom_preferences variable to false fails because of the /etc/apt/preferences concatenated_file being re-defined. Fix this by setting dependencies on the resource only when we expect to create the /etc/apt/preferences file. Also, since there is no "ensure" parameter to concatenated_file, use a simple file resource to ensure that it is removed. Signed-off-by: Gabriel Filion <lelutin@gmail.com>
Diffstat (limited to 'manifests/preferences')
-rw-r--r--manifests/preferences/absent.pp5
1 files changed, 1 insertions, 4 deletions
diff --git a/manifests/preferences/absent.pp b/manifests/preferences/absent.pp
index 3131aff..d8b2e10 100644
--- a/manifests/preferences/absent.pp
+++ b/manifests/preferences/absent.pp
@@ -1,8 +1,5 @@
class apt::preferences::absent {
- include common::moduledir
- $apt_preferences_dir = "${common::moduledir::module_dir_path}/apt/preferences"
- concatenated_file{'/etc/apt/preferences':
- dir => $apt_preferences_dir,
+ file {'/etc/apt/preferences':
ensure => absent,
}
}