diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-01-31 11:24:06 -0800 |
|---|---|---|
| committer | Daniel Pittman <daniel@rimspace.net> | 2011-01-31 11:24:06 -0800 |
| commit | ecd7cda64bdf3c8cd97b7c05f9cf7eb890d3682b (patch) | |
| tree | 6c07ee88a921caee62d88e3a0bb8cdcb3efbdeed /lib/facter/util/loader.rb | |
| parent | d9b8f2ad68626b8655d98a8d9037283f671f86bb (diff) | |
| parent | b88a088c6e53ef96914280e6937b9b9214b6c64b (diff) | |
| download | facter-ecd7cda64bdf3c8cd97b7c05f9cf7eb890d3682b.tar.gz facter-ecd7cda64bdf3c8cd97b7c05f9cf7eb890d3682b.tar.xz facter-ecd7cda64bdf3c8cd97b7c05f9cf7eb890d3682b.zip | |
Merge branch 'bug/next/5510-deterministic-fact-load-order' into next
Diffstat (limited to 'lib/facter/util/loader.rb')
| -rw-r--r-- | lib/facter/util/loader.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/facter/util/loader.rb b/lib/facter/util/loader.rb index ac90c48..2d2d9e8 100644 --- a/lib/facter/util/loader.rb +++ b/lib/facter/util/loader.rb @@ -30,7 +30,7 @@ class Facter::Util::Loader search_path.each do |dir| next unless FileTest.directory?(dir) - Dir.entries(dir).each do |file| + Dir.entries(dir).sort.each do |file| path = File.join(dir, file) if File.directory?(path) load_dir(path) @@ -62,7 +62,7 @@ class Facter::Util::Loader def load_dir(dir) return if dir =~ /\/\.+$/ or dir =~ /\/util$/ or dir =~ /\/lib$/ - Dir.entries(dir).find_all { |f| f =~ /\.rb$/ }.each do |file| + Dir.entries(dir).find_all { |f| f =~ /\.rb$/ }.sort.each do |file| load_file(File.join(dir, file)) end end |