Changeset 501 for CMT

Timestamp:

May 15, 2009, 10:23:57 PM (15 years ago)

Author:

rybkin

Message:

See C.L. 396

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/cmt_lsb_system_version.sh (modified) (1 diff)
• mgr/cmt_svn_checkout.py (modified) (1 diff)
• source/cmt_project.cxx (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2009-05-15    <rybkin@lal.in2p3.fr> 396
+        
+        * source/cmt_project.cxx: In function Project::add, print a diagnostic
+        message only if the Verbose level is activated
+        * mgr/cmt_lsb_system_version.sh: Make the script more generic
+        * mgr/cmt_svn_checkout.py: Update the version
+        
 2009-05-05    <rybkin@lal.in2p3.fr> 395
         

CMT/HEAD/mgr/cmt_lsb_system_version.sh

@@ -1 +1 @@
 export LC_ALL=C
-lsb_release -d | sed -n '
-s#^.* \{1,\}\([^ ]\{1,\}\) \{1,\}release \{1,\}\([^ ]\{1,\}\) *.*#\1-\2#
+lsb_release -d | sed -n '/release/{
+s#^.*[[:blank:]]\{1,\}\([^[:blank:]]\{1,\}\)[[:blank:]]\{1,\}release[[:blank:]]\{1,\}\([[:digit:]][^[:blank:]]*\).*#\1-\2#
 y#ABCDEFGHIJKLMNOPQRSTUVWXYZ#abcdefghijklmnopqrstuvwxyz#
 p
-'
+}'

CMT/HEAD/mgr/cmt_svn_checkout.py

@@ -23 +23 @@
 """
 
-__version__ = '0.1.4'
-__date__ = 'Mon Apr 29 2009'
+__version__ = '0.1.5'
+__date__ = 'Tue May 05 2009'
 __author__ = 'Grigory Rybkin'
 

CMT/HEAD/source/cmt_project.cxx

@@ -860 +860 @@
             if (release != project->get_release ())
               {
-                CmtMessage::error ("Project " + name
-                                   + " requested with conflicting releases "
-                                   + project->get_release () + " and " + release);
+                if (CmtMessage::active (Verbose))
+                  CmtMessage::error ("Project " + name
+                                     + " requested with conflicting releases "
+                                     + project->get_release () + " and " + release);
                 //              cerr << "#CMT> Project " << name << " requested with conflicting releases " << project->get_release () << " and " << release << endl;
                 CmtError::set (CmtError::project_release_conflict, name);