summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2016-10-29 09:02:18 +0000
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2016-10-29 09:02:18 +0000
commit65066a585657ac58b3f7ed7e071ae5087abd0d9c (patch)
tree9b60836adfee96fc89a6aa43f3beacd474231f29
parenta18c940b0195e76a7640818a7c7d92d289380c36 (diff)
parentb8a461638eca77e2fdd82c6bf07784b0b44cc917 (diff)
Merge branch 'fix_nextcodename_on_testing' into 'master'
Always set debian_nextcodename to 'sid' on systems running testing, fixes #12 See merge request !49
-rw-r--r--lib/facter/debian_nextcodename.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/facter/debian_nextcodename.rb b/lib/facter/debian_nextcodename.rb
index c4c569b..654fe20 100644
--- a/lib/facter/debian_nextcodename.rb
+++ b/lib/facter/debian_nextcodename.rb
@@ -4,8 +4,10 @@ rescue LoadError
require "#{File.dirname(__FILE__)}/util/debian"
end
-def debian_codename_to_next(codename)
- if codename == "sid"
+def debian_codename_to_next(codename, release)
+ if release == "testing"
+ return "sid"
+ elsif release == "unstable"
return "experimental"
else
codenames = Facter::Util::Debian::CODENAMES
@@ -18,6 +20,6 @@ end
Facter.add(:debian_nextcodename) do
confine :operatingsystem => 'Debian'
setcode do
- debian_codename_to_next(Facter.value('debian_codename'))
+ debian_codename_to_next(Facter.value('debian_codename'), Facter.value('debian_release'))
end
end