aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-10-10 12:05:26 +0200
committerintrigeri <intrigeri@boum.org>2010-10-10 12:05:26 +0200
commitb4e24ecc0699687adec30bd38d78b34423eda1a1 (patch)
tree117533c8cf230c0ba3a4a494da3ae5f41ab88870
parent7b82df6d0bbd00f3d7c5dc4e0c47df84e6139301 (diff)
downloadpuppet-apt-b4e24ecc0699687adec30bd38d78b34423eda1a1.tar.gz
puppet-apt-b4e24ecc0699687adec30bd38d78b34423eda1a1.tar.bz2
Fix functions return values.
-rw-r--r--lib/puppet/parser/functions/debian_nextcodename.rb12
-rw-r--r--lib/puppet/parser/functions/debian_nextrelease.rb4
-rw-r--r--lib/puppet/parser/functions/debian_release.rb5
3 files changed, 11 insertions, 10 deletions
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