summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-05-26 17:04:05 -0400
committerMicah Anderson <micah@riseup.net>2013-05-26 17:04:05 -0400
commit61a2f4894898baa98dbaaba7b69b7198864ca04a (patch)
treed0a5253e66eaf69bee0db5aa7d85ab305aeeb66c /lib
parent6bf7a6ab5d6e63f75c94f49aa0f12959e954efa8 (diff)
parentc38be6cb7c2cbd53a133291b2750d053877ebe4f (diff)
Merge branch 'master' into leap
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/parser/functions/debian_nextcodename.rb3
-rw-r--r--lib/puppet/parser/functions/debian_release.rb6
-rw-r--r--lib/puppet/parser/functions/debian_release_version.rb1
3 files changed, 6 insertions, 4 deletions
diff --git a/lib/puppet/parser/functions/debian_nextcodename.rb b/lib/puppet/parser/functions/debian_nextcodename.rb
index f57dd2a..3d5c3bd 100644
--- a/lib/puppet/parser/functions/debian_nextcodename.rb
+++ b/lib/puppet/parser/functions/debian_nextcodename.rb
@@ -4,7 +4,8 @@ module Puppet::Parser::Functions
when "etch" then "lenny"
when "lenny" then "squeeze"
when "squeeze" then "wheezy"
- when "wheezy" then "sid"
+ when "wheezy" then "jessie"
+ when "jessie" then "sid"
when "sid" then "experimental"
else "sid"
end
diff --git a/lib/puppet/parser/functions/debian_release.rb b/lib/puppet/parser/functions/debian_release.rb
index 857edf3..d7b6718 100644
--- a/lib/puppet/parser/functions/debian_release.rb
+++ b/lib/puppet/parser/functions/debian_release.rb
@@ -1,9 +1,9 @@
module Puppet::Parser::Functions
newfunction(:debian_release, :type => :rvalue) do |args|
case args[0]
- when 'lenny' then 'oldstable'
- when 'squeeze' then 'stable'
- when 'wheezy' then 'testing'
+ when 'squeeze' then 'oldstable'
+ when 'wheezy' then 'stable'
+ when 'jessie' then 'testing'
when 'sid' then 'unstable'
when 'experimental' then 'experimental'
else 'testing'
diff --git a/lib/puppet/parser/functions/debian_release_version.rb b/lib/puppet/parser/functions/debian_release_version.rb
index ff58f72..0abe90e 100644
--- a/lib/puppet/parser/functions/debian_release_version.rb
+++ b/lib/puppet/parser/functions/debian_release_version.rb
@@ -4,6 +4,7 @@ module Puppet::Parser::Functions
when 'etch' then '4.0'
when 'lenny' then '5.0'
when 'squeeze' then '6.0'
+ when 'wheezy' then '7.0'
else ''
end
end