Changeset 597 for CMT

Timestamp:

Dec 11, 2011, 1:06:37 PM (12 years ago)

Author:

rybkin

Message:

See C.L. 474

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/cmt_install_action.bat (modified) (1 diff)
• mgr/cmt_install_action.sh (modified) (1 diff)
• mgr/cmt_uninstall_action.bat (modified) (1 diff)
• mgr/cmt_uninstall_action.sh (modified) (4 diffs)
• source/cmt_system.cxx (modified) (8 diffs)
• source/cmt_use.cxx (modified) (3 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2011-12-11    <rybkin@lal.in2p3.fr> 474
+
+        * source/cmt_system.cxx: In class CmtSystem, in function cd, do not print
+        error message on system chdir function failure, in functions test_directory,
+        test_file, do not set error or print error message on system stat function
+        failure, in functions create_symlink, remove_file, on POSIX systems, do not
+        print error message or return failure on system unlink function failure for
+        errno == ENOTDIR
+        * source/cmt_use.cxx: In function uninstall_library, always remove
+        reference file with internal command (as create)
+        * mgr/cmt_install_action.sh: Exit with error on file command or reference
+        file command error
+        * mgr/cmt_uninstall_action.sh: idem
+        * mgr/cmt_install_action.bat: idem
+        * mgr/cmt_uninstall_action.bat: idem
+        
 2011-12-10    <rybkin@lal.in2p3.fr> 473
 

CMT/HEAD/mgr/cmt_install_action.bat

@@ -34 +34 @@
 
 copy /Y %full_source_name% %dest_file_path%
+if errorlevel 1 exit /B 1
 echo %full_source_name% >%ref_file%
+if errorlevel 1 exit /B 1

CMT/HEAD/mgr/cmt_install_action.sh

@@ -151 +151 @@
 fi
 if test "${makecmd}"; then set -v; fi
-eval ${install_command} ${full_source_name} ${dest_file_path}
-echo ${full_source_name} >${ref_file}
+eval ${install_command} ${full_source_name} ${dest_file_path} || exit
+echo ${full_source_name} >${ref_file} || exit
 if test "${makecmd}"; then set +v; fi

CMT/HEAD/mgr/cmt_uninstall_action.bat

@@ -29 +29 @@
 
 if exist %dest_file_path% del %dest_file_path%
+if errorlevel 1 exit /B 1
 if exist %ref_file% del %ref_file%
+if errorlevel 1 exit /B 1

CMT/HEAD/mgr/cmt_uninstall_action.sh

@@ -132 +132 @@
 fi
 if test "${makecmd}"; then set -v; fi
-  /bin/rm -f ${dest_file_path}
+  /bin/rm -f ${dest_file_path} || exit
 if test "${makecmd}"; then set +v; fi
 
@@ -141 +141 @@
 fi
 if test "${makecmd}"; then set -v; fi
-  /bin/rm -rf ${dest_file_path}
+  /bin/rm -rf ${dest_file_path} || exit
 if test "${makecmd}"; then set +v; fi
 
@@ -150 +150 @@
 fi
 if test "${makecmd}"; then set -v; fi
-  /bin/rm -f ${dest_file_path}
+  /bin/rm -f ${dest_file_path} || exit
 if test "${makecmd}"; then set +v; fi
 
@@ -157 +157 @@
 if test -f ${ref_file}; then
 if test "${makecmd}"; then set -v; fi
-  /bin/rm -f ${ref_file}
+  /bin/rm -f ${ref_file} || exit
 if test "${makecmd}"; then set +v; fi
 fi

CMT/HEAD/source/cmt_system.cxx

@@ -168 +168 @@
   else
     {
+      /*
       if (errno != ENOENT
 #ifndef WIN32
@@ -174 +175 @@
           )
         perror ("cmt: chdir failure: " + get_absolute_path (s_dir));
+      */
       return (false);
     }
@@ -428 +430 @@
   else
     {
+      /*
       if (errno != ENOENT
 #ifndef WIN32
@@ -437 +440 @@
           CmtError::set (CmtError::file_access_error, get_absolute_path (name));
         }
+      */
       return (false);
     }
@@ -462 +466 @@
   else
     {
+      /*
       if (errno != ENOENT
 #ifndef WIN32
@@ -471 +476 @@
           CmtError::set (CmtError::file_access_error, get_absolute_path (name));
         }
+      */
       return (false);
     }
@@ -825 +831 @@
 {
   if (-1 == ::unlink (newname)
-      && errno != ENOENT)
+      && errno != ENOENT
+#ifndef WIN32
+      && errno != ENOTDIR
+#endif
+      )
     {
       perror ("cmt: unlink failure: " + get_absolute_path (newname));
@@ -858 +868 @@
       //      CmtMessage::error ("Cannot remove file " + name);
       //      cerr << "#CMT> Cannot remove file " << name << endl;
-      if (errno != ENOENT)
-        perror ("cmt: unlink failure: " + get_absolute_path (name));
-      return (false);
+      if (errno != ENOENT
+#ifndef WIN32
+          && errno != ENOTDIR
+#endif
+          )
+        {
+          perror ("cmt: unlink failure: " + get_absolute_path (name));
+          return (false);
+        }
+      return (true);
     }
 }

CMT/HEAD/source/cmt_use.cxx

@@ -3928 +3928 @@
       if (CmtMessage::active (Info))
         cerr << "   Removing reference file " << r << endl;
+      if (!CmtSystem::remove_file (r))
+        {
+          CmtError::set (CmtError::file_access_error, r);
+          return false;
+        }
+      /*
       if (symunlinkcmd == "")
         {
-          if (!CmtSystem::remove_file (r) && CmtSystem::test_file(r))
+          //if (!CmtSystem::remove_file (r) && CmtSystem::test_file(r))
+          if (!CmtSystem::remove_file (r))
             {
               CmtError::set (CmtError::file_access_error, r);
@@ -3948 +3955 @@
             }
         }
+      */
     }
   else
@@ -3986 +3994 @@
   if (symunlinkcmd == "")
     {
-      if (!CmtSystem::remove_file (s) && CmtSystem::test_file(s))
+      //if (!CmtSystem::remove_file (s) && CmtSystem::test_file(s))
+      if (!CmtSystem::remove_file (s))
         {
           CmtError::set (CmtError::file_access_error, "Cannot remove symbolic link to " + libname);