summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2013-01-02 16:54:03 +0100
committerintrigeri <intrigeri@boum.org>2013-01-02 16:54:03 +0100
commit17f67d9fac83193f4436e82fc6046e065d9ab024 (patch)
tree18f053bb4149e785ae47ab935e21e6f43b8ced31
parentaac83e728c11ec576ea07e8c5ea990740c66e908 (diff)
Simplify codename handling.
Have the codename class parameter default to $::lsbdistcodename, and derive $release from it.
-rw-r--r--manifests/init.pp8
1 files changed, 2 insertions, 6 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index a851011..5c0738b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,7 +4,7 @@
# See LICENSE for the full license granted to you.
class apt(
- $codename = '',
+ $codename = $::lsbdistcodename,
$use_volatile = false,
$include_src = false,
$use_next_release = false,
@@ -39,12 +39,8 @@ class apt(
include lsb
- # init $release, $next_release, $codename, $next_codename, $release_version
+ # init $release, $next_release, $next_codename, $release_version
case $codename {
- '': {
- $codename = $::lsbdistcodename
- $release = $::lsbdistrelease
- }
'n/a': {
fail("Unknown lsbdistcodename reported by facter: '$lsbdistcodename', please fix this by setting this variable in your manifest.")
}