Changeset 608 for CMT/HEAD/source/cmt_use.cxx

Timestamp:

Apr 5, 2012, 1:43:26 PM (12 years ago)

Author:

rybkin

Message:

See C.L. 483

File:

• CMT/HEAD/source/cmt_use.cxx (modified) (6 diffs)

CMT/HEAD/source/cmt_use.cxx

@@ -1853 +1853 @@
   manager   = "";
   real_path = "";
+  m_realpath = "";
 
   prefix    = "";
@@ -1930 +1931 @@
 
   real_path = "";
+  m_realpath = "";
 
   if (new_path != "")
@@ -1947 +1949 @@
 
       CmtSystem::compress_path (real_path);
+      if (!CmtSystem::realpath_ (real_path, m_realpath))
+        {
+          CmtError::set (CmtError::file_access_error, "Cannot compute real path `" +
+                         real_path + "'");
+          CmtError::print ();
+          return;
+        }
     }
   
@@ -3559 +3568 @@
   offset = "";
 
-  cmtpath = Project::find_in_cmt_paths (real_path);
-  Project* p = Project::find_by_cmtpath (cmtpath);
+  cmtpath = m_realpath.size ()
+    ? Project::find_in_cmt_paths (m_realpath, true)
+    : Project::find_in_cmt_paths (real_path)
+    ;
+  const Project* p = Project::find_by_cmtpath (cmtpath);
 
   //  if (cmtpath != "")
@@ -3574 +3586 @@
       //      offset.replace (cmtpath, empty_string);
       //cerr << "realpath_: get_cmtpath_and_offset" << endl;
-      if (!CmtSystem::realpath_ (real_path, offset))
+      if (0 != m_realpath.size ())
+        offset = m_realpath;
+      else if (!CmtSystem::realpath_ (real_path, offset))
         {
           CmtError::set (CmtError::file_access_error, "Cannot compute real path `" +
@@ -3605 +3619 @@
 bool Use::get_strategy (const cmt_string& name) const
 {
-  const Project* p = Project::find_by_cmtpath (Project::find_in_cmt_paths (real_path));
+  const Project* p =
+    Project::find_by_cmtpath (m_realpath.size ()
+                              ? Project::find_in_cmt_paths (m_realpath, true)
+                              : Project::find_in_cmt_paths (real_path)
+                              );
+  //  const Project* p = Project::find_by_cmtpath (Project::find_in_cmt_paths (real_path));
 
   bool strategy;