# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1342725499 14400
# Node ID f10cddda37c5d0b62bdbe9d3b8d816020d98f495
# Parent  f20312fc904665401fe0e1cf445cfe482ee7b151
omit warning for multiple Contents.m files in the load path

* load-path.cc (load_path::add_to_fcn_map): Don't warn about multiple
Contents.m files in the load path.

diff --git a/src/load-path.cc b/src/load-path.cc
--- a/src/load-path.cc
+++ b/src/load-path.cc
@@ -1798,7 +1798,11 @@
                   // way we look for old.dir_name in sys_path to avoid
                   // partial matches?
 
-                  if (sys_path.find (old.dir_name) != std::string::npos
+                  // Don't warn about Contents.m files since we expect
+                  // more than one to exist in the load path.
+
+                  if (fname != "Contents.m"
+                      && sys_path.find (old.dir_name) != std::string::npos
                       && in_path_list (sys_path, old.dir_name))
                     {
                       std::string fcn_path = file_ops::concat (dir_name, fname);