aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-12-18 16:45:38 -0500
committerMicah Anderson <micah@riseup.net>2012-12-18 16:45:38 -0500
commit7de392c40e0037c2abdf6d659f28212b265a1eb3 (patch)
treeecab28c66120931d443ff313f6fe7d2448428004
parent4f433dbd5238e6b5211d3b0f240ff58031c3da2b (diff)
downloadpuppet-apt-7de392c40e0037c2abdf6d659f28212b265a1eb3.tar.gz
puppet-apt-7de392c40e0037c2abdf6d659f28212b265a1eb3.tar.bz2
On a sid system, $lsbdistcodename is reports 'n/a', this doesn't work because the module
looks for a template based on the $lsbdistcodename, so you get this error: Could not find template 'apt/Debian/preferences_n/a.erb' The slash in 'n/a' appears to be a path (confusing!) So I've set an error message when 'n/a' is encountered, encouraging the user to set the $lsbdistcodename. I was not confident in the idea of pointing any occurrence of 'n/a' to the sid templates, as I could imagine a case where this might occur on a non-sid system where the lsbdistcodename isn't properly detected
-rw-r--r--manifests/init.pp3
1 files changed, 3 insertions, 0 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 2ae691f..802da3a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -68,6 +68,9 @@ class apt {
$codename = $lsbdistcodename
$release = $lsbdistrelease
}
+ 'n/a': {
+ fail("Unknown lsbdistcodename reported by facter: '$lsbdistcodename', please fix this by setting this variable in your manifest.")
+ }
default: {
$codename = $lsbdistcodename
$release = debian_release($codename)