- Timestamp:
- Dec 11, 2011, 1:06:37 PM (12 years ago)
- Location:
- CMT/HEAD
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/HEAD/ChangeLog
r596 r597 1 2011-12-11 <rybkin@lal.in2p3.fr> 474 2 3 * source/cmt_system.cxx: In class CmtSystem, in function cd, do not print 4 error message on system chdir function failure, in functions test_directory, 5 test_file, do not set error or print error message on system stat function 6 failure, in functions create_symlink, remove_file, on POSIX systems, do not 7 print error message or return failure on system unlink function failure for 8 errno == ENOTDIR 9 * source/cmt_use.cxx: In function uninstall_library, always remove 10 reference file with internal command (as create) 11 * mgr/cmt_install_action.sh: Exit with error on file command or reference 12 file command error 13 * mgr/cmt_uninstall_action.sh: idem 14 * mgr/cmt_install_action.bat: idem 15 * mgr/cmt_uninstall_action.bat: idem 16 1 17 2011-12-10 <rybkin@lal.in2p3.fr> 473 2 18 -
CMT/HEAD/mgr/cmt_install_action.bat
r445 r597 34 34 35 35 copy /Y %full_source_name% %dest_file_path% 36 if errorlevel 1 exit /B 1 36 37 echo %full_source_name% >%ref_file% 38 if errorlevel 1 exit /B 1 -
CMT/HEAD/mgr/cmt_install_action.sh
r561 r597 151 151 fi 152 152 if test "${makecmd}"; then set -v; fi 153 eval ${install_command} ${full_source_name} ${dest_file_path} 154 echo ${full_source_name} >${ref_file} 153 eval ${install_command} ${full_source_name} ${dest_file_path} || exit 154 echo ${full_source_name} >${ref_file} || exit 155 155 if test "${makecmd}"; then set +v; fi -
CMT/HEAD/mgr/cmt_uninstall_action.bat
r445 r597 29 29 30 30 if exist %dest_file_path% del %dest_file_path% 31 if errorlevel 1 exit /B 1 31 32 if exist %ref_file% del %ref_file% 33 if errorlevel 1 exit /B 1 -
CMT/HEAD/mgr/cmt_uninstall_action.sh
r591 r597 132 132 fi 133 133 if test "${makecmd}"; then set -v; fi 134 /bin/rm -f ${dest_file_path} 134 /bin/rm -f ${dest_file_path} || exit 135 135 if test "${makecmd}"; then set +v; fi 136 136 … … 141 141 fi 142 142 if test "${makecmd}"; then set -v; fi 143 /bin/rm -rf ${dest_file_path} 143 /bin/rm -rf ${dest_file_path} || exit 144 144 if test "${makecmd}"; then set +v; fi 145 145 … … 150 150 fi 151 151 if test "${makecmd}"; then set -v; fi 152 /bin/rm -f ${dest_file_path} 152 /bin/rm -f ${dest_file_path} || exit 153 153 if test "${makecmd}"; then set +v; fi 154 154 … … 157 157 if test -f ${ref_file}; then 158 158 if test "${makecmd}"; then set -v; fi 159 /bin/rm -f ${ref_file} 159 /bin/rm -f ${ref_file} || exit 160 160 if test "${makecmd}"; then set +v; fi 161 161 fi -
CMT/HEAD/source/cmt_system.cxx
r596 r597 168 168 else 169 169 { 170 /* 170 171 if (errno != ENOENT 171 172 #ifndef WIN32 … … 174 175 ) 175 176 perror ("cmt: chdir failure: " + get_absolute_path (s_dir)); 177 */ 176 178 return (false); 177 179 } … … 428 430 else 429 431 { 432 /* 430 433 if (errno != ENOENT 431 434 #ifndef WIN32 … … 437 440 CmtError::set (CmtError::file_access_error, get_absolute_path (name)); 438 441 } 442 */ 439 443 return (false); 440 444 } … … 462 466 else 463 467 { 468 /* 464 469 if (errno != ENOENT 465 470 #ifndef WIN32 … … 471 476 CmtError::set (CmtError::file_access_error, get_absolute_path (name)); 472 477 } 478 */ 473 479 return (false); 474 480 } … … 825 831 { 826 832 if (-1 == ::unlink (newname) 827 && errno != ENOENT) 833 && errno != ENOENT 834 #ifndef WIN32 835 && errno != ENOTDIR 836 #endif 837 ) 828 838 { 829 839 perror ("cmt: unlink failure: " + get_absolute_path (newname)); … … 858 868 // CmtMessage::error ("Cannot remove file " + name); 859 869 // cerr << "#CMT> Cannot remove file " << name << endl; 860 if (errno != ENOENT) 861 perror ("cmt: unlink failure: " + get_absolute_path (name)); 862 return (false); 870 if (errno != ENOENT 871 #ifndef WIN32 872 && errno != ENOTDIR 873 #endif 874 ) 875 { 876 perror ("cmt: unlink failure: " + get_absolute_path (name)); 877 return (false); 878 } 879 return (true); 863 880 } 864 881 } -
CMT/HEAD/source/cmt_use.cxx
r595 r597 3928 3928 if (CmtMessage::active (Info)) 3929 3929 cerr << " Removing reference file " << r << endl; 3930 if (!CmtSystem::remove_file (r)) 3931 { 3932 CmtError::set (CmtError::file_access_error, r); 3933 return false; 3934 } 3935 /* 3930 3936 if (symunlinkcmd == "") 3931 3937 { 3932 if (!CmtSystem::remove_file (r) && CmtSystem::test_file(r)) 3938 //if (!CmtSystem::remove_file (r) && CmtSystem::test_file(r)) 3939 if (!CmtSystem::remove_file (r)) 3933 3940 { 3934 3941 CmtError::set (CmtError::file_access_error, r); … … 3948 3955 } 3949 3956 } 3957 */ 3950 3958 } 3951 3959 else … … 3986 3994 if (symunlinkcmd == "") 3987 3995 { 3988 if (!CmtSystem::remove_file (s) && CmtSystem::test_file(s)) 3996 //if (!CmtSystem::remove_file (s) && CmtSystem::test_file(s)) 3997 if (!CmtSystem::remove_file (s)) 3989 3998 { 3990 3999 CmtError::set (CmtError::file_access_error, "Cannot remove symbolic link to " + libname);
Note: See TracChangeset
for help on using the changeset viewer.