diff options
| author | John Keiser <jkeiser@opscode.com> | 2013-05-20 15:19:16 -0700 |
|---|---|---|
| committer | John Keiser <jkeiser@opscode.com> | 2013-06-07 13:12:34 -0700 |
| commit | cd88e4769d6d7df4902af27ce69a32b47be098b6 (patch) | |
| tree | 33c55bd28b6281fc17b1f3c85f66385ba129a865 | |
| parent | b908cc22ad1439f116967b729ae5f078585d91ee (diff) | |
| download | chef-cd88e4769d6d7df4902af27ce69a32b47be098b6.tar.gz | |
Stabilize output of file system directories for filesystems without sorted listing
| -rw-r--r-- | lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb | 2 | ||||
| -rw-r--r-- | lib/chef/chef_fs/file_system/file_system_entry.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb b/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb index 069cc2b6f4..fd599696ac 100644 --- a/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb +++ b/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb @@ -83,7 +83,7 @@ class Chef def children @children ||= - Dir.entries(file_path). + Dir.entries(file_path).sort. select { |entry| entry != '.' && entry != '..' }. map { |entry| ChefRepositoryFileSystemEntry.new(entry, self) }. select { |entry| !ignored?(entry) } diff --git a/lib/chef/chef_fs/file_system/file_system_entry.rb b/lib/chef/chef_fs/file_system/file_system_entry.rb index 850e266526..82c52deae8 100644 --- a/lib/chef/chef_fs/file_system/file_system_entry.rb +++ b/lib/chef/chef_fs/file_system/file_system_entry.rb @@ -40,7 +40,7 @@ class Chef def children begin - @children ||= Dir.entries(file_path).select { |entry| entry != '.' && entry != '..' }.map { |entry| FileSystemEntry.new(entry, self) } + @children ||= Dir.entries(file_path).sort.select { |entry| entry != '.' && entry != '..' }.map { |entry| FileSystemEntry.new(entry, self) } rescue Errno::ENOENT raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!) end |