From b4e24ecc0699687adec30bd38d78b34423eda1a1 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sun, 10 Oct 2010 12:05:26 +0200
Subject: Fix functions return values.

---
 lib/puppet/parser/functions/debian_nextcodename.rb | 12 ++++++------
 lib/puppet/parser/functions/debian_nextrelease.rb  |  4 ++--
 lib/puppet/parser/functions/debian_release.rb      |  5 +++--
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/debian_nextcodename.rb b/lib/puppet/parser/functions/debian_nextcodename.rb
index 37322a2..6bc4b6b 100644
--- a/lib/puppet/parser/functions/debian_nextcodename.rb
+++ b/lib/puppet/parser/functions/debian_nextcodename.rb
@@ -1,11 +1,11 @@
 module Puppet::Parser::Functions
   newfunction(:debian_nextcodename, :type => :rvalue) do |args|
-    result = case #{args[0]}
-      when 'etch'    then 'lenny'
-      when 'lenny'   then 'squeeze'
-      when 'squeeze' then 'sid'
-      when 'sid'     then 'experimental'
+    case args[0]
+      when "etch"    then "lenny"
+      when "lenny"   then "squeeze"
+      when "squeeze" then "sid"
+      when "sid"     then "experimental"
+      else "sid"
     end
-    return result
   end
 end
diff --git a/lib/puppet/parser/functions/debian_nextrelease.rb b/lib/puppet/parser/functions/debian_nextrelease.rb
index 62e3234..76c3e0d 100644
--- a/lib/puppet/parser/functions/debian_nextrelease.rb
+++ b/lib/puppet/parser/functions/debian_nextrelease.rb
@@ -1,11 +1,11 @@
 module Puppet::Parser::Functions
   newfunction(:debian_nextrelease, :type => :rvalue) do |args|
-    result = case #{args[0]}
+    case args[0]
       when 'oldstable' then 'stable'
       when 'stable'    then 'testing'
       when 'testing'   then 'unstable'
       when 'unstable'  then 'experimental'
+      else 'unstable'
     end
-    return result
   end
 end
diff --git a/lib/puppet/parser/functions/debian_release.rb b/lib/puppet/parser/functions/debian_release.rb
index ec46601..64feb66 100644
--- a/lib/puppet/parser/functions/debian_release.rb
+++ b/lib/puppet/parser/functions/debian_release.rb
@@ -1,12 +1,13 @@
 module Puppet::Parser::Functions
   newfunction(:debian_release, :type => :rvalue) do |args|
-    result = case #{args[0]}
+    case args[0]
       when 'etch'         then 'oldstable'
       when 'lenny'        then 'stable'
       when 'squeeze'      then 'testing'
+      when 'wheezy'       then 'testing'
       when 'sid'          then 'unstable'
       when 'experimental' then 'experimental'
+      else 'testing'
     end
-    return result
   end
 end
-- 
cgit v1.2.3