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

Timestamp:

May 27, 2016, 4:59:21 PM (8 years ago)

Author:

rybkin

Message:

See C.L. 528

File:

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

CMT/HEAD/source/cmt_use.cxx

@@ -752 +752 @@
       if (!use->located ())
         {
+          if (use->get_package_name () == "cmt_standalone") continue;
           CmtError::set (CmtError::package_not_found, use->get_info ());
-        }
-      else
-        {
-          /*
-            CmtMessage::info ("package " +
-            use->get_package_name () +
-            " " + use->version +
-            (use->path != "" ? " " + use->path : "") +
-            " found");
-          */
         }
     }
@@ -5847 +5838 @@
     {
       cmt_string s (Symbol::get_env_value ("CMTHEADVERSION"));
+      // strip the leading '!'
+      // See mgr/cmt_svn_checkout.py:CmtContext::set_head_version
+      if (0 != s.size () && '!' == s[0]) s = s.substr(1);
       static const cmt_string package_template = "<package>";
       s.replace_all (package_template, get_package_name ());