[bug] Fix debian_nextcodename on wheezy hosts

I noticed this behaviour because $::debian_nextcodename was
"squeeze" on a wheezy host.
For debugging, i inserted a "puts codenames" in
lib/facter/debian_nextcodename.rb, and it turned out that it
was sorted differently on wheezy and jessie hosts:

On wheezy:

    buster
    stretch
    jessie
    wheezy
    squeeze
    lenny

On jessie:

    lenny
    squeeze
    wheezy
    jessie
    stretch
    buster

So i decided to rewrite this so this doesn't happen again.

diff --git a/lib/facter/debian_nextcodename.rb b/lib/facter/debian_nextcodename.rb
index 6e994a4deea30be3c23c7dfa6380f6d7d84d8588..c4c569b23c833b18cc95f089ad7d8062c531cdce 100644 (file)
--- a/lib/facter/debian_nextcodename.rb
+++ b/lib/facter/debian_nextcodename.rb
@@ -8,11 +8,10 @@ def debian_codename_to_next(codename)
   if codename == "sid"
     return "experimental"
   else
-    codenames = Facter::Util::Debian::CODENAMES.values
-    i = codenames.index(codename)
-    if i and i+1 < codenames.count
-      return codenames[i+1]
-    end
+    codenames = Facter::Util::Debian::CODENAMES
+    versions  = Facter::Util::Debian::CODENAMES.invert
+    current_version = versions[codename]
+    return codenames[(current_version.to_i + 1).to_s]
   end
 end
 

diff --git a/lib/facter/util/ubuntu.rb b/lib/facter/util/ubuntu.rb
index 1b2411af6d6f9bf024d4915885b8e71fd1695009..52c15e80bcf0450167d3deef262112ea7e2e5a57 100644 (file)
--- a/lib/facter/util/ubuntu.rb
+++ b/lib/facter/util/ubuntu.rb
@@ -14,6 +14,7 @@ module Facter
         "utopic",
         "vivid",
         "wily",
+        "xenial"
       ]
     end
   end