From d50104ce10d7709c9c21f475eb6241136f937ad8 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
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')
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