Author: mlandres Date: Fri Dec 7 17:08:27 2007 New Revision: 8061 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8061&view=rev Log: Remove runtime dependency for libboost_filesystem Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/CMakeLists.txt trunk/libzypp/zypp/PathInfo.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=8061&r1=8060&r2=8061&view=diff ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Fri Dec 7 17:08:27 2007 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "4") SET(LIBZYPP_MINOR "1") SET(LIBZYPP_COMPATMINOR "1") -SET(LIBZYPP_PATCH "4") +SET(LIBZYPP_PATCH "5") Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=8061&r1=8060&r2=8061&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Fri Dec 7 17:08:27 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Dec 7 15:47:53 CET 2007 - ma@suse.de + +- Remove runtime dependency for libboost_filesystem (#345773) +- version 4.1.5 +- revision 8061 + +------------------------------------------------------------------- Fri Nov 30 14:20:34 CET 2007 - schubi@suse.de - Enable SAT solver via environment variable ZYPP_SAT_SOLVER. Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=8061&r1=8060&r2=8061&view=diff ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Fri Dec 7 17:08:27 2007 @@ -1177,7 +1177,7 @@ SET_TARGET_PROPERTIES( zypp PROPERTIES SOVERSION "${LIBZYPP_SOVERSION_INFO}" ) ADD_DEPENDENCIES(zypp schema_header) # System libraries -TARGET_LINK_LIBRARIES(zypp boost_filesystem util ) +TARGET_LINK_LIBRARIES(zypp util ) TARGET_LINK_LIBRARIES(zypp ${DBUS_LIBRARY} ) TARGET_LINK_LIBRARIES(zypp dbus-glib-1 ) TARGET_LINK_LIBRARIES(zypp ${GLIB_LIBRARY} ) Modified: trunk/libzypp/zypp/PathInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PathInfo.cc?rev=8061&r1=8060&r2=8061&view=diff ============================================================================== --- trunk/libzypp/zypp/PathInfo.cc (original) +++ trunk/libzypp/zypp/PathInfo.cc Fri Dec 7 17:08:27 2007 @@ -377,6 +377,38 @@ // METHOD NAME : recursive_rmdir // METHOD TYPE : int // + static int recursive_rmdir_1( const Pathname & dir ) + { + DIR * dp; + struct dirent * d; + + if ( ! (dp = opendir( dir.c_str() )) ) + return _Log_Result( errno ); + + while ( (d = readdir(dp)) ) + { + std::string direntry = d->d_name; + if ( direntry == "." || direntry == ".." ) + continue; + Pathname new_path( dir / d->d_name ); + + struct stat st; + if ( ! lstat( new_path.c_str(), &st ) ) + { + if ( S_ISDIR( st.st_mode ) ) + recursive_rmdir_1( new_path ); + else + ::unlink( new_path.c_str() ); + } + } + closedir( dp ); + + if ( ::rmdir( dir.c_str() ) < 0 ) + return _Log_Result( errno ); + + return _Log_Result( 0 ); + } + /////////////////////////////////////////////////////////////////// int recursive_rmdir( const Pathname & path ) { MIL << "recursive_rmdir " << path << ' '; @@ -390,18 +422,7 @@ return _Log_Result( ENOTDIR ); } - try - { - boost::filesystem::path bp( path.asString(), boost::filesystem::native ); - boost::filesystem::remove_all( bp ); - } - catch ( boost::filesystem::filesystem_error & excpt ) - { - WAR << " FAILED: " << excpt.what() << endl; - return -1; - } - - return _Log_Result( 0 ); + return recursive_rmdir_1( path ); } /////////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org