equal
deleted
inserted
replaced
|
1 --- ruby-1.8.7-p334.orig/lib/rdoc/rdoc.rb Mon Feb 12 15:01:19 2007 |
|
2 +++ ruby-1.8.7-p334/lib/rdoc/rdoc.rb Fri Mar 25 11:17:13 2011 |
|
3 @@ -200,7 +200,9 @@ |
|
4 # we may well contain subdirectories which must |
|
5 # be tested for .document files |
|
6 def list_files_in_directory(dir, options) |
|
7 - normalized_file_list(options, Dir.glob(File.join(dir, "*")), false, options.exclude) |
|
8 + # Fix for CR6650926, we're sorting the file list alphabetically to ensure that rdoc traverses the input in a predictable manner. |
|
9 + #normalized_file_list(options, Dir.glob(File.join(dir, "*")), false, options.exclude) |
|
10 + normalized_file_list(options, Dir.glob(File.join(dir, "*")).sort, false, options.exclude) |
|
11 end |
|
12 |
|
13 |