[Pkg-puppet-devel] [SCM] Packaging of Facter for debian branch, upstream, updated. 3a39dd8353b6308cf49522990104cc63e55d7cda

James Turnbull james at lovedthanlost.net
Fri Jan 29 17:22:20 UTC 2010


The following commit has been merged in the upstream branch:
commit 7fa257689b08d5c6c8e22da9da49f0679aa9b1d9
Author: James Turnbull <james at lovedthanlost.net>
Date:   Tue Apr 21 07:25:10 2009 +1000

    Fixed #2132 - support for named interface aliases under linux

diff --git a/CHANGELOG b/CHANGELOG
index b0f9931..ac92eaf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
-1.6.x:
+1.5.5:
+    Fixed #2132 - Support for named interfaces under Linux
+
     Fixed #2080 - IPAddress resolutions should be reordered
 
     Fixed #2078 - ip.rb errors command not found
diff --git a/lib/facter/util/ip.rb b/lib/facter/util/ip.rb
index 55b5e92..e06e506 100644
--- a/lib/facter/util/ip.rb
+++ b/lib/facter/util/ip.rb
@@ -52,7 +52,7 @@ module Facter::Util::IP
         # We get lots of warnings on platforms that don't get an output
         # made.
         if output
-            int = output.scan(/^\w+[.:]?\d+[.:]?\d*/)
+            int = output.scan(/^\w+[.:]?\d+[.:]?\d*[.:]?\w*/)
         else
             []
         end

-- 
Packaging of Facter for debian



More information about the Pkg-puppet-devel mailing list