Changeset 540 for CMT/HEAD/source/cmt_vcs.cxx

Timestamp:

Mar 31, 2010, 6:36:09 PM (14 years ago)

Author:

rybkin

Message:

See C.L. 427

File:

• CMT/HEAD/source/cmt_vcs.cxx (modified) (5 diffs)

CMT/HEAD/source/cmt_vcs.cxx

@@ -158 +158 @@
         CmtMessage::verbose ("container " + use->get_info () +
                              " (" + use->real_path + ")");
-        Use* cuse = Use::add (use->real_path,
+        //      Use* cuse = Use::add (use->real_path,
+        Use* cuse = Use::add (use->path,
                               use->get_package_name (),
                               use->version,
@@ -352 +353 @@
               return p_use;
             }
-          Use* n_use = Use::add (use->real_path,
+          //      Use* n_use = Use::add (use->real_path,
+          Use* n_use = Use::add (use->path,
                                  use->get_package_name (),
                                  use->version,
@@ -622 +624 @@
       //      cerr << " `" + s + "'"; 
       if (s[0] == '-') continue;
+
+      if (s.find ("$(") != cmt_string::npos
+          || s.find ("${") != cmt_string::npos)
+        {
+          CmtMessage::warning (line +
+                               ": Skipped due to macro reference(s)."
+                               " Consider using -C option.");
+          return;
+        }
 
       switch (state)
@@ -4176 +4187 @@
         CmtMessage::warning (use->get_info () +
                              ": Skipped due to wildcards in version."
-                             " Consider using -C option.");
+                             " Consider using -C or -r HEAD option.");
         return;
       }
@@ -4242 +4253 @@
         CmtMessage::warning (use->get_info () +
                              ": Skipped due to wildcards in version."
-                             " Consider using -C option.");
+                             " Consider using -C or -r HEAD option.");
         return;
       }