Changeset 679 for CMT

Timestamp:

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

Author:

rybkin

Message:

See C.L. 528

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/cmt_svn_checkout.py (modified) (2 diffs)
• source/cmt_use.cxx (modified) (2 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2016-05-27    <rybkin@lal.in2p3.fr> 528
+
+        * mgr/cmt_svn_checkout.py: Strip leading '!' from CMTHEADVERSION value, if any,
+        when setting package version
+        * source/cmt_use.cxx: Strip leading '!' from CMTHEADVERSION value, if any,
+        when checking for head version, do not set error when use is not located
+        if it corresponds to "cmt_standalone" package
+
 2016-05-18    <rybkin@lal.in2p3.fr> 527
 

CMT/HEAD/mgr/cmt_svn_checkout.py

@@ -24 +24 @@
 """
 
-__version__ = '0.9.0'
-__date__ = 'Wed May 18 2016'
+__version__ = '0.10.0'
+__date__ = 'Fri May 27 2016'
 __author__ = 'Grigory Rybkin'
 
@@ -214 +214 @@
             self.head_version_tag = False
         elif version.startswith('!'):
-            # it may be appropriate to strip the leading '!'
-            # that will require synchronization with C++ code, however
-            # self.head_version = version[1:]
-            self.head_version = version
+            # strip the leading '!'
+            # require synchronization with C++ code
+            self.head_version = version[1:]
             self.head_version_tag = False
         else:

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 ());