Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/ruby/patches/03-rdoc_rb.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 11 Mar 2013 10:38:09 -0700
branchs11-update
changeset 2520 ceec631e74d1
parent 199 b87534be1a76
permissions -rw-r--r--
Close of build 10.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
199
b87534be1a76 7023222 move ruby to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     1
 
--- ruby-1.8.7-p334.orig/lib/rdoc/rdoc.rb	Mon Feb 12 15:01:19 2007
b87534be1a76 7023222 move ruby to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     2
 
+++ ruby-1.8.7-p334/lib/rdoc/rdoc.rb	Fri Mar 25 11:17:13 2011
b87534be1a76 7023222 move ruby to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     3
 
@@ -200,7 +200,9 @@
b87534be1a76 7023222 move ruby to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     4
 
     # we may well contain subdirectories which must
b87534be1a76 7023222 move ruby to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     5
 
     # be tested for .document files
b87534be1a76 7023222 move ruby to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     6
 
     def list_files_in_directory(dir, options)
b87534be1a76 7023222 move ruby to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     7
 
-      normalized_file_list(options, Dir.glob(File.join(dir, "*")), false, options.exclude)
b87534be1a76 7023222 move ruby to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     8
 
+      # Fix for CR6650926, we're sorting the file list alphabetically to ensure that rdoc traverses the input in a predictable manner.
b87534be1a76 7023222 move ruby to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     9
 
+      #normalized_file_list(options, Dir.glob(File.join(dir, "*")), false, options.exclude)
b87534be1a76 7023222 move ruby to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    10
 
+       normalized_file_list(options, Dir.glob(File.join(dir, "*")).sort, false, options.exclude)
b87534be1a76 7023222 move ruby to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    11
 
     end
b87534be1a76 7023222 move ruby to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    12
b87534be1a76 7023222 move ruby to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    13
upstream/oracle/userland-gate