Changeset 497

Timestamp:

Apr 29, 2009, 2:29:53 PM (15 years ago)

Author:

rybkin

Message:

See C.L. 392

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/VisualC.nmake (modified) (2 diffs)
• mgr/cmt.nmake (modified) (2 diffs)
• mgr/cmt_dependencies.nmake (modified) (3 diffs)
• mgr/cmt_svn_checkout.py (modified) (2 diffs)
• source/cmt_system.cxx (modified) (2 diffs)
• source/cmt_vcs.cxx (modified) (13 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2009-04-29    <rybkin@lal.in2p3.fr> 392
+        
+        * source/cmt_system.cxx: In function CmtSystem::execute, return -1 on
+        failure and return status of the command otherwise
+        * source/cmt_vcs.cxx: Ensure "cmt checkout" command exist status is set to
+        a nonzero value on error. In particular, in function execute_and_retry, on
+        failure, exit with the exit status of the last failed command, in function
+        check_protocol, on failure, exit with 1, also make use of CmtError::set
+        when appropriate
+        * mgr/cmt_svn_checkout.py: Catch ImportError exception in case Subversion
+        Python bindings cannot be imported
+        
 2009-04-27    <rybkin@lal.in2p3.fr> 391
         

CMT/HEAD/mgr/VisualC.nmake

@@ -37 +37 @@
 build_dependencies=$(cmtexe) -tag=$(tags) build dependencies 
 build_triggers=$(cmtexe) build triggers 
-format_dependencies=$(CMTROOT)\mgr\cmt_format_deps.bat /no_stamps 
+format_dependencies=$(CMTROOT)\mgr\cmt_format_deps.bat 
 implied_library_prefix=-l 
 implied_library_suffix=.lib 
@@ -52 +52 @@
 lock_suffix=.lock 
 lock_file=$(lock_name)$(lock_suffix) 
+svn_checkout_command=python $(CMTROOT)\mgr\cmt_svn_checkout.py  
 MAKEFLAGS= --no-print-directory  
 gmake_hosts=lx1 rsplus lxtest as7 dxplus ax7 hp2 aleph hp1 hpplus papou1-fe atlas 

CMT/HEAD/mgr/cmt.nmake

@@ -63 +63 @@
 
 
-$(bin)cmt$(application_suffix) :: $(bin)cmt\cmt.obj $(bin)cmt\cmt_awk.obj $(bin)cmt\cmt_branch.obj $(bin)cmt\cmt_constituent.obj $(bin)cmt\cmt_deps_builder.obj $(bin)cmt\cmt_fragment.obj $(bin)cmt\cmt_generator.obj $(bin)cmt\cmt_include.obj $(bin)cmt\cmt_parser.obj $(bin)cmt\cmt_script.obj $(bin)cmt\cmt_string.obj $(bin)cmt\cmt_system.obj $(bin)cmt\cmt_tag.obj $(bin)cmt\cmt_use.obj $(bin)cmt\cmt_symbol.obj $(bin)cmt\cmt_error.obj $(bin)cmt\cmt_pattern.obj $(bin)cmt\cmt_language.obj $(bin)cmt\cmt_cvs.obj $(bin)cmt\cmt_group.obj $(bin)cmt\cmt_database.obj $(bin)cmt\cmt_lock.obj $(bin)cmt\cmt_triggers.obj $(bin)cmt\cmt_regexp.obj $(bin)cmt\cmt_model.obj $(bin)cmt\cmt_project.obj $(bin)cmt\cmt_syntax.obj $(bin)cmt\cmt_install_area.obj $(bin)cmt\cmt_cmtpath_pattern.obj $(bin)cmt\cmt_sequence.obj $(bin)cmt\cmt_generators.obj $(bin)cmt\cmt_scope_section.obj $(bin)cmt\cmt_log.obj $(bin)cmt\cmt_commands.obj $(use_stamps) $(cmtstamps) requirements $(use_requirements)
+$(bin)cmt$(application_suffix) :: $(bin)cmt\cmt.obj $(bin)cmt\cmt_awk.obj $(bin)cmt\cmt_branch.obj $(bin)cmt\cmt_constituent.obj $(bin)cmt\cmt_deps_builder.obj $(bin)cmt\cmt_fragment.obj $(bin)cmt\cmt_generator.obj $(bin)cmt\cmt_include.obj $(bin)cmt\cmt_parser.obj $(bin)cmt\cmt_script.obj $(bin)cmt\cmt_string.obj $(bin)cmt\cmt_system.obj $(bin)cmt\cmt_tag.obj $(bin)cmt\cmt_use.obj $(bin)cmt\cmt_symbol.obj $(bin)cmt\cmt_error.obj $(bin)cmt\cmt_pattern.obj $(bin)cmt\cmt_language.obj $(bin)cmt\cmt_vcs.obj $(bin)cmt\cmt_group.obj $(bin)cmt\cmt_database.obj $(bin)cmt\cmt_lock.obj $(bin)cmt\cmt_triggers.obj $(bin)cmt\cmt_regexp.obj $(bin)cmt\cmt_model.obj $(bin)cmt\cmt_project.obj $(bin)cmt\cmt_syntax.obj $(bin)cmt\cmt_install_area.obj $(bin)cmt\cmt_cmtpath_pattern.obj $(bin)cmt\cmt_sequence.obj $(bin)cmt\cmt_generators.obj $(bin)cmt\cmt_scope_section.obj $(bin)cmt\cmt_log.obj $(bin)cmt\cmt_commands.obj $(use_stamps) $(cmtstamps) requirements $(use_requirements)
         $(link_echo) $@
         $(link_silent) $(cpplink) /out:$(bin)cmt$(application_suffix) @<<
-$(bin)cmt\cmt.obj $(bin)cmt\cmt_awk.obj $(bin)cmt\cmt_branch.obj $(bin)cmt\cmt_constituent.obj $(bin)cmt\cmt_deps_builder.obj $(bin)cmt\cmt_fragment.obj $(bin)cmt\cmt_generator.obj $(bin)cmt\cmt_include.obj $(bin)cmt\cmt_parser.obj $(bin)cmt\cmt_script.obj $(bin)cmt\cmt_string.obj $(bin)cmt\cmt_system.obj $(bin)cmt\cmt_tag.obj $(bin)cmt\cmt_use.obj $(bin)cmt\cmt_symbol.obj $(bin)cmt\cmt_error.obj $(bin)cmt\cmt_pattern.obj $(bin)cmt\cmt_language.obj $(bin)cmt\cmt_cvs.obj $(bin)cmt\cmt_group.obj $(bin)cmt\cmt_database.obj $(bin)cmt\cmt_lock.obj $(bin)cmt\cmt_triggers.obj $(bin)cmt\cmt_regexp.obj $(bin)cmt\cmt_model.obj $(bin)cmt\cmt_project.obj $(bin)cmt\cmt_syntax.obj $(bin)cmt\cmt_install_area.obj $(bin)cmt\cmt_cmtpath_pattern.obj $(bin)cmt\cmt_sequence.obj $(bin)cmt\cmt_generators.obj $(bin)cmt\cmt_scope_section.obj $(bin)cmt\cmt_log.obj $(bin)cmt\cmt_commands.obj
+$(bin)cmt\cmt.obj $(bin)cmt\cmt_awk.obj $(bin)cmt\cmt_branch.obj $(bin)cmt\cmt_constituent.obj $(bin)cmt\cmt_deps_builder.obj $(bin)cmt\cmt_fragment.obj $(bin)cmt\cmt_generator.obj $(bin)cmt\cmt_include.obj $(bin)cmt\cmt_parser.obj $(bin)cmt\cmt_script.obj $(bin)cmt\cmt_string.obj $(bin)cmt\cmt_system.obj $(bin)cmt\cmt_tag.obj $(bin)cmt\cmt_use.obj $(bin)cmt\cmt_symbol.obj $(bin)cmt\cmt_error.obj $(bin)cmt\cmt_pattern.obj $(bin)cmt\cmt_language.obj $(bin)cmt\cmt_vcs.obj $(bin)cmt\cmt_group.obj $(bin)cmt\cmt_database.obj $(bin)cmt\cmt_lock.obj $(bin)cmt\cmt_triggers.obj $(bin)cmt\cmt_regexp.obj $(bin)cmt\cmt_model.obj $(bin)cmt\cmt_project.obj $(bin)cmt\cmt_syntax.obj $(bin)cmt\cmt_install_area.obj $(bin)cmt\cmt_cmtpath_pattern.obj $(bin)cmt\cmt_sequence.obj $(bin)cmt\cmt_generators.obj $(bin)cmt\cmt_scope_section.obj $(bin)cmt\cmt_log.obj $(bin)cmt\cmt_commands.obj
 $(use_linkopts)
 $(cmtlinkopts)
@@ -253 +253 @@
 #-- start of cpp ------
 
-$(bin)cmt/cmt_cvs.obj : $(cmt_cvs_cxx_dependencies)
-        $(cpp_echo) $@
-        @if not exist $(bin)cmt mkdir $(bin)cmt
-        $(cpp_silent) $(cppcomp) /Fo$(bin)cmt\cmt_cvs.obj  /Fd$(bin)cmt\ $(use_pp_cppflags) $(cmt_pp_cppflags) $(app_cmt_pp_cppflags) $(cmt_cvs_pp_cppflags) $(use_cppflags) $(cmt_cppflags) $(app_cmt_cppflags) $(cmt_cvs_cppflags) $(cmt_cvs_cxx_cppflags) -I..\source /Tp..\source\cmt_cvs.cxx
+$(bin)cmt/cmt_vcs.obj : $(cmt_vcs_cxx_dependencies)
+        $(cpp_echo) $@
+        @if not exist $(bin)cmt mkdir $(bin)cmt
+        $(cpp_silent) $(cppcomp) /Fo$(bin)cmt\cmt_vcs.obj  /Fd$(bin)cmt\ $(use_pp_cppflags) $(cmt_pp_cppflags) $(app_cmt_pp_cppflags) $(cmt_vcs_pp_cppflags) $(use_cppflags) $(cmt_cppflags) $(app_cmt_cppflags) $(cmt_vcs_cppflags) $(cmt_vcs_cxx_cppflags) -I..\source /Tp..\source\cmt_vcs.cxx
 
 #-- end of cpp ------

CMT/HEAD/mgr/cmt_dependencies.nmake

@@ -7 +7 @@
 cmt_generator_cxx_dependencies = "..\source\cmt_generator.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_awk.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_deps_builder.h" "..\source\cmt_generator.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_generators.h" "..\source\cmt_log.h"
 cmt_include_cxx_dependencies = "..\source\cmt_include.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_include.h" "..\source\cmt_map.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_log.h"
-cmt_parser_cxx_dependencies = "..\source\cmt_parser.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_version.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_map.h" "..\source\cmt_pattern.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_deps_builder.h" "..\source\cmt_generator.h" "..\source\cmt_error.h" "..\source\cmt_cvs.h" "..\source\cmt_lock.h" "..\source\cmt_triggers.h" "..\source\cmt_model.h" "..\source\cmt_syntax.h" "..\source\cmt_install_area.h" "..\source\cmt_sequence.h" "..\source\cmt_log.h" "..\source\cmt_commands.h"
+cmt_parser_cxx_dependencies = "..\source\cmt_parser.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_version.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_map.h" "..\source\cmt_pattern.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_deps_builder.h" "..\source\cmt_generator.h" "..\source\cmt_error.h" "..\source\cmt_cvs.h" "..\source\cmt_vcs.h" "..\source\cmt_lock.h" "..\source\cmt_triggers.h" "..\source\cmt_model.h" "..\source\cmt_syntax.h" "..\source\cmt_install_area.h" "..\source\cmt_sequence.h" "..\source\cmt_log.h" "..\source\cmt_commands.h"
 cmt_script_cxx_dependencies = "..\source\cmt_script.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_script.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h"
 cmt_string_cxx_dependencies = "..\source\cmt_string.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h"
@@ -17 +17 @@
 cmt_pattern_cxx_dependencies = "..\source\cmt_pattern.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_parser.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_map.h" "..\source\cmt_pattern.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_error.h" "..\source\cmt_syntax.h" "..\source\cmt_log.h"
 cmt_language_cxx_dependencies = "..\source\cmt_language.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_fragment.h" "..\source\cmt_language.h" "..\source\cmt_branch.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_map.h" "..\source\cmt_pattern.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h"
-cmt_cvs_cxx_dependencies = "..\source\cmt_cvs.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_parser.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_cvs.h" "..\source\cmt_awk.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_project.h" "..\source\cmt_log.h"
+cmt_vcs_cxx_dependencies = "..\source\cmt_vcs.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_parser.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_cvs.h" "..\source\cmt_vcs.h" "..\source\cmt_awk.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_project.h" "..\source\cmt_log.h" "..\source\cmt_error.h"
 cmt_group_cxx_dependencies = "..\source\cmt_group.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_group.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_map.h" "..\source\cmt_pattern.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h"
 cmt_database_cxx_dependencies = "..\source\cmt_database.cxx" "..\source\cmt_vector.h" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_map.h" "..\source\cmt_pattern.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h"
@@ -32 +32 @@
 cmt_scope_section_cxx_dependencies = "..\source\cmt_scope_section.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_scope_section.h"
 cmt_log_cxx_dependencies = "..\source\cmt_log.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_log.h" "..\source\cmt_vector.h" "..\source\cmt_parser.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h"
-cmt_commands_cxx_dependencies = "..\source\cmt_commands.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_map.h" "..\source\cmt_parser.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_commands.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_log.h"
+cmt_commands_cxx_dependencies = "..\source\cmt_commands.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_map.h" "..\source\cmt_parser.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_commands.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_log.h" "..\source\cmt_error.h"

CMT/HEAD/mgr/cmt_svn_checkout.py

@@ -23 +23 @@
 """
 
-__version__ = '0.1.1'
-__date__ = 'Mon Apr 20 2009'
+__version__ = '0.1.2'
+__date__ = 'Mon Apr 28 2009'
 __author__ = 'Grigory Rybkin'
 
@@ -34 +34 @@
 import urlparse
 
-from svn import client, core
+self = 'cmt_svn_checkout.py'
+try:
+    from svn import client, core
+except ImportError, e:
+    print >>sys.stderr, '%s: %s: cannot import Subversion Python bindings' \
+          % (self, str(e))
+    sys.exit(1)
 
 class ClientContext(object):

CMT/HEAD/source/cmt_system.cxx

@@ -28 +28 @@
 
 #define stat _stat
+#define WEXITSTATUS(w) (w)
 
 #else
@@ -1610 +1611 @@
 {
   //cerr << "CmtSystem::execute1> [" << command << "]" << endl;
-
-  return (system (command.c_str ()));
+  int status = system (command.c_str ());
+  if (status == -1) // failed
+    return -1;
+  else
+    return WEXITSTATUS(status); // return status of the command
+  //  return (system (command.c_str ()));
 }
 

CMT/HEAD/source/cmt_vcs.cxx

@@ -301 +301 @@
             
             char stat[8];
+            //sprintf (stat, "%d", WEXITSTATUS(status));
             sprintf (stat, "%d", status);
+            char ret[8];
+            sprintf (ret, "%d", retry);
             CmtMessage::error ("# " + message + ": status=" + stat);
             CmtMessage::error ("#---------------------------------------------------------");
@@ -307 +310 @@
             //      cerr << "#---------------------------------------------------------" << endl;
             
-            if (retry > 5) exit(0);
+            if (retry > 5)
+              {
+                exit(status);
+                //              exit(0);
+              }
+            else
+              {
+                CmtMessage::info (command + " [retry: " + ret + "]");
+              }
           }
         else
@@ -422 +433 @@
           }
       }
-    
+
+    if (!found)
+      {
+        CmtMessage::error ("The CVS pluggin is not installed or is not at protocol level " + m_protocol_level);
+        exit(1);
+      }
+
     return (found);
   }
@@ -864 +881 @@
       {
         versions = "";
-        CmtMessage::error ("Product " + product + " not found in ${CVSROOT}");
+        CmtError::set (CmtError::configuration_error, "Product " + product + " not found in ${CVSROOT}");
+        //      CmtMessage::error ("Product " + product + " not found in ${CVSROOT}");
         //      cerr << "#CMT> Product " << product << " not found in ${CVSROOT}" << endl;
         return (false);
@@ -1094 +1112 @@
 
     cmt_string version_dir = version;
-    if (!mkdir (version_dir)) return (false);
+    if (!mkdir (version_dir))
+    {
+      CmtError::set (CmtError::execution_error, "Cannot create " + version_dir);
+      return (false);   
+    }
 
     dir += CmtSystem::file_separator ();
@@ -1293 +1315 @@
     if (need_version)
       {
-        if (!mkdir (version)) return (false);   
+        if (!mkdir (version))
+          {
+            CmtError::set (CmtError::execution_error, "Cannot create " + version);
+            return (false);     
+          }
         dir += CmtSystem::file_separator ();
         dir += version;
@@ -1299 +1325 @@
     else
       {
-        if (!mkdir (package)) return (false);
+        if (!mkdir (package))
+        {
+          CmtError::set (CmtError::execution_error, "Cannot create " + package);
+          return (false);       
+        }
         
         dir += CmtSystem::file_separator ();
@@ -1463 +1493 @@
       }
 
-    if (!mkdir (dir)) return (false);
+    if (!mkdir (dir))
+      {
+        CmtError::set (CmtError::execution_error, "Cannot create " + dir);
+        return (false);
+      }
         
     if (structure_info == "package")
@@ -1891 +1925 @@
         if (!CmtSystem::cd (dir))
           {
-            CmtMessage::error ("Package directory not created " + dir);
+            CmtError::set (CmtError::configuration_error,
+                           "Package directory not created " + dir);
+            //      CmtMessage::error ("Package directory not created " + dir);
             //      cerr << "#CMT> Package directory not created " << dir << endl;
             return;
@@ -1989 +2025 @@
         if (!CmtSystem::cd (dir))
           {
-            CmtMessage::error ("Project directory not created " + dir);
+            CmtError::set (CmtError::configuration_error,
+                           "Project directory not created " + dir);
+            //      CmtMessage::error ("Project directory not created " + dir);
             //      cerr << "#CMT> Project directory not created " << dir << endl;
             return;
@@ -2070 +2108 @@
       if (error_info != "")
         {
-          CmtMessage::error (error_info);
+          CmtError::set (CmtError::configuration_error, error_info);
+          //CmtMessage::error (error_info);
           //      cerr << error_info << endl;
           return;
@@ -2174 +2213 @@
         if (!CmtSystem::test_file (file_name))
           {
-            CmtMessage::error (product + " was not properly checked out and is missing its cmt/project.cmt file");
+            CmtError::set (CmtError::configuration_error, product +
+                           " was not properly checked out and is missing its cmt/project.cmt file");
+            //CmtMessage::error (product + " was not properly checked out and is missing its cmt/project.cmt file");
             //      cerr << "# " << product << " was not properly checked out and is missing its cmt/project.cmt file" << endl;
             return;
@@ -2207 +2248 @@
             else
               {
-                CmtMessage::error (product + " was not properly checked out and is missing its cmt/requirements file");
+                CmtError::set (CmtError::configuration_error, product +
+                               " was not properly checked out and is missing its cmt/requirements file");
+                //              CmtMessage::error (product + " was not properly checked out and is missing its cmt/requirements file");
                 //              cerr << "# " << product << " was not properly checked out and is missing its cmt/requirements file" << endl;
                 return;