From 5326c54b817d6d86c1322dd1b923d1345460a721 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 9 Oct 2010 21:18:10 +0200 Subject: Rename function file so that puppet hopefully finds it. --- lib/puppet/parser/functions/debian_release.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 lib/puppet/parser/functions/debian_release.rb (limited to 'lib/puppet/parser/functions/debian_release.rb') diff --git a/lib/puppet/parser/functions/debian_release.rb b/lib/puppet/parser/functions/debian_release.rb new file mode 100644 index 0000000..ef30484 --- /dev/null +++ b/lib/puppet/parser/functions/debian_release.rb @@ -0,0 +1,11 @@ +module Puppet::Parser::Functions + newfunction(:debian_release, :type => :rvalue) do |args| + case #{args[0]} { + etch: { 'oldstable' } + lenny: { 'stable' } + squeeze: { 'testing' } + sid: { 'unstable' } + experimental: { 'experimental' } + } + end +end -- cgit v1.2.3 From d50104ce10d7709c9c21f475eb6241136f937ad8 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sun, 10 Oct 2010 11:00:18 +0200 Subject: Fix functions declaration and filenames. --- lib/puppet/parser/functions/debian_nextcodename.rb | 11 +++++++++++ lib/puppet/parser/functions/debian_nextrelease.rb | 11 +++++++++++ lib/puppet/parser/functions/debian_release.rb | 15 ++++++++------- lib/puppet/parser/functions/nextcodename.rb | 10 ---------- lib/puppet/parser/functions/nextrelease.rb | 10 ---------- 5 files changed, 30 insertions(+), 27 deletions(-) create mode 100644 lib/puppet/parser/functions/debian_nextcodename.rb create mode 100644 lib/puppet/parser/functions/debian_nextrelease.rb delete mode 100644 lib/puppet/parser/functions/nextcodename.rb delete mode 100644 lib/puppet/parser/functions/nextrelease.rb (limited to 'lib/puppet/parser/functions/debian_release.rb') diff --git a/lib/puppet/parser/functions/debian_nextcodename.rb b/lib/puppet/parser/functions/debian_nextcodename.rb new file mode 100644 index 0000000..37322a2 --- /dev/null +++ b/lib/puppet/parser/functions/debian_nextcodename.rb @@ -0,0 +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' + end + return result + end +end diff --git a/lib/puppet/parser/functions/debian_nextrelease.rb b/lib/puppet/parser/functions/debian_nextrelease.rb new file mode 100644 index 0000000..62e3234 --- /dev/null +++ b/lib/puppet/parser/functions/debian_nextrelease.rb @@ -0,0 +1,11 @@ +module Puppet::Parser::Functions + newfunction(:debian_nextrelease, :type => :rvalue) do |args| + result = case #{args[0]} + when 'oldstable' then 'stable' + when 'stable' then 'testing' + when 'testing' then 'unstable' + when 'unstable' then 'experimental' + end + return result + end +end diff --git a/lib/puppet/parser/functions/debian_release.rb b/lib/puppet/parser/functions/debian_release.rb index ef30484..ec46601 100644 --- a/lib/puppet/parser/functions/debian_release.rb +++ b/lib/puppet/parser/functions/debian_release.rb @@ -1,11 +1,12 @@ module Puppet::Parser::Functions newfunction(:debian_release, :type => :rvalue) do |args| - case #{args[0]} { - etch: { 'oldstable' } - lenny: { 'stable' } - squeeze: { 'testing' } - sid: { 'unstable' } - experimental: { 'experimental' } - } + result = case #{args[0]} + when 'etch' then 'oldstable' + when 'lenny' then 'stable' + when 'squeeze' then 'testing' + when 'sid' then 'unstable' + when 'experimental' then 'experimental' + end + return result end end diff --git a/lib/puppet/parser/functions/nextcodename.rb b/lib/puppet/parser/functions/nextcodename.rb deleted file mode 100644 index 3dd592b..0000000 --- a/lib/puppet/parser/functions/nextcodename.rb +++ /dev/null @@ -1,10 +0,0 @@ -module Puppet::Parser::Functions - newfunction(:debian_nextcodename, :type => :rvalue) do |args| - case #{args[0]} { - etch: { 'lenny' } - lenny: { 'squeeze' } - squeeze: { 'sid' } - sid: { 'experimental' } - } - end -end diff --git a/lib/puppet/parser/functions/nextrelease.rb b/lib/puppet/parser/functions/nextrelease.rb deleted file mode 100644 index 4449121..0000000 --- a/lib/puppet/parser/functions/nextrelease.rb +++ /dev/null @@ -1,10 +0,0 @@ -module Puppet::Parser::Functions - newfunction(:debian_nextrelease, :type => :rvalue) do |args| - case #{args[0]} { - oldstable: { 'stable' } - stable: { 'testing' } - testing: { 'unstable' } - unstable: { 'experimental' } - } - end -end -- cgit v1.2.3 From b4e24ecc0699687adec30bd38d78b34423eda1a1 Mon Sep 17 00:00:00 2001 From: intrigeri 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/puppet/parser/functions/debian_release.rb') 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 From f362f059956d745037425eb5f8c27ce48c14632e Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sun, 6 Feb 2011 08:56:54 +0100 Subject: Update debian_release function since Squeeze has been released. --- lib/puppet/parser/functions/debian_release.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib/puppet/parser/functions/debian_release.rb') diff --git a/lib/puppet/parser/functions/debian_release.rb b/lib/puppet/parser/functions/debian_release.rb index 64feb66..857edf3 100644 --- a/lib/puppet/parser/functions/debian_release.rb +++ b/lib/puppet/parser/functions/debian_release.rb @@ -1,9 +1,8 @@ module Puppet::Parser::Functions newfunction(:debian_release, :type => :rvalue) do |args| case args[0] - when 'etch' then 'oldstable' - when 'lenny' then 'stable' - when 'squeeze' then 'testing' + when 'lenny' then 'oldstable' + when 'squeeze' then 'stable' when 'wheezy' then 'testing' when 'sid' then 'unstable' when 'experimental' then 'experimental' -- cgit v1.2.3