Changeset 457 for CMT

Timestamp:

May 13, 2008, 12:25:12 PM (16 years ago)

Author:

rybkin

Message:

See C.L. 358

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_parser.cxx (modified) (3 diffs)
• source/cmt_project.cxx (modified) (2 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2008-05-13    <rybkin@lal.in2p3.fr> 358
+        
+        * source/cmt_project.cxx: Add the real CMTPATH of project to the paths returned
+        by Project::fill_selection ()
+        * source/cmt_parser.cxx: When cmt broadcast is run, ensure that the current package
+        is not skipped due to symlinks in the paths 
+        
 2008-04-21    <rybkin@lal.in2p3.fr> 357
         

CMT/HEAD/source/cmt_parser.cxx

@@ -1440 +1440 @@
   //if (command.substr (0, 3) == "cmt") is_cmt = true;
 
+  cmt_string curuse = CmtSystem::pwd ();
   if (all_packages)
     {
@@ -1505 +1506 @@
           }
 
+        curuse = s;
+
         cmt_string& v = versions.add ();
         v = use->version;
@@ -1532 +1535 @@
       bool excluded = false;
 
-      if (path_selections.size () > 0)
+      /**
+         Ensure that the current package is not skipped
+         due to symlinks in the paths
+       */
+      //      if (path_selections.size () > 0)
+      if (path_selections.size () > 0 && s != curuse)
         {
           selected = false;

CMT/HEAD/source/cmt_project.cxx

@@ -987 +987 @@
       const cmt_string& p = project.get_cmtpath ();
       const cmt_string& pwd = project.get_cmtpath_pwd ();
+      const cmt_string& p_real = project.get_cmtpath_real ();
       const cmt_string& src = project.get_cmtpath_source ();
 
@@ -995 +996 @@
               cmt_string& s1 = path_selections.add ();
               s1 = p;
-              cmt_string& s2 = path_selections.add ();
-              s2 = pwd;
+              if (pwd != p)
+                {
+                  cmt_string& s2 = path_selections.add ();
+                  s2 = pwd;
+                }
+              if (p_real != p && p_real != pwd)
+                {
+                  cmt_string& s3 = path_selections.add ();
+                  s3 = p_real;
+                }
               depth--;