Fix loading of util/debian.rb for custom facts

requirering the facter/util/debian.rb module causes
puppet warnings on wheezy hosts, and custom facts like
`$::debian_codename` cannot be evaluated.

    warning: Could not load fact file
      /srv/dev/projects/puppet/shared-modules//apt/lib/facter/debian_nextcodename.rb:
      no such file to load -- facter/util/debian

Removing the require line solves this.

diff --git a/lib/facter/debian_codename.rb b/lib/facter/debian_codename.rb
index 06ec5ffc606f236f98dd5b01031de82ec49c5fc0..254877aaa6fca5becacbfc929a16272ad7e8f308 100644 (file)
--- a/lib/facter/debian_codename.rb
+++ b/lib/facter/debian_codename.rb
@@ -1,5 +1,7 @@
 begin
   require 'facter/util/debian'
+rescue LoadError
+  require "#{File.dirname(__FILE__)}/util/debian"
 end
 
 def version_to_codename(version)

diff --git a/lib/facter/debian_lts.rb b/lib/facter/debian_lts.rb
index 1c137e1117f1afd641ab29263893274a47a88780..f53a9eb86736008ddf1f010e68b9fd857cfac1b4 100644 (file)
--- a/lib/facter/debian_lts.rb
+++ b/lib/facter/debian_lts.rb
@@ -1,5 +1,7 @@
 begin
   require 'facter/util/debian'
+rescue LoadError
+  require "#{File.dirname(__FILE__)}/util/debian"
 end
 
 Facter.add(:debian_lts) do

diff --git a/lib/facter/debian_nextcodename.rb b/lib/facter/debian_nextcodename.rb
index af16cc854ccd4a61f37bf5cd2e2cadcf71abe866..6e994a4deea30be3c23c7dfa6380f6d7d84d8588 100644 (file)
--- a/lib/facter/debian_nextcodename.rb
+++ b/lib/facter/debian_nextcodename.rb
@@ -1,5 +1,7 @@
 begin
   require 'facter/util/debian'
+rescue LoadError
+  require "#{File.dirname(__FILE__)}/util/debian"
 end
 
 def debian_codename_to_next(codename)

diff --git a/lib/facter/debian_release.rb b/lib/facter/debian_release.rb
index 09e8eeffef94b3041777bca0798f2c99e0502f31..2c334ccd7d77daea05ef945d8608e15891f2a5f6 100644 (file)
--- a/lib/facter/debian_release.rb
+++ b/lib/facter/debian_release.rb
@@ -1,5 +1,7 @@
 begin
   require 'facter/util/debian'
+rescue LoadError
+  require "#{File.dirname(__FILE__)}/util/debian"
 end
 
 def debian_codename_to_release(codename)

diff --git a/lib/facter/ubuntu_nextcodename.rb b/lib/facter/ubuntu_nextcodename.rb
index 38b64ade938148d08abfb975223a0ef8929ecf3f..ba985bfcad7fe7710109e239b0ed005e5a76331b 100644 (file)
--- a/lib/facter/ubuntu_nextcodename.rb
+++ b/lib/facter/ubuntu_nextcodename.rb
@@ -1,5 +1,7 @@
 begin
   require 'facter/util/ubuntu'
+rescue LoadError
+  require "#{File.dirname(__FILE__)}/util/debian"
 end
 
 def ubuntu_codename_to_next(codename)