November 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r11571 - in /trunk/libzypp: ./ devel/ devel/devel.jkupec/ devel/devel.jsrain/yum/ doc/autodoc/ po/ tests/ tests/lib/ tests/repo/ tests/sat/ tests/zypp/ zypp/
by dmacvicar＠svn.opensuse.org 04 Nov '08

04 Nov '08

Author: dmacvicar Date: Tue Nov 4 16:10:56 2008 New Revision: 11571 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11571&view=rev Log: CMAKE_SOURCE_DIR AND _BINARY_DIR to LIBZYPP_SOURCE_... so we can build libzypp as a subproject in the future. Modified: trunk/libzypp/CMakeLists.txt trunk/libzypp/devel/CMakeLists.txt trunk/libzypp/devel/devel.jkupec/CMakeLists.txt trunk/libzypp/devel/devel.jsrain/yum/CMakeLists.txt trunk/libzypp/doc/autodoc/CMakeLists.txt trunk/libzypp/po/CMakeLists.txt trunk/libzypp/tests/CMakeLists.txt trunk/libzypp/tests/lib/CMakeLists.txt trunk/libzypp/tests/repo/CMakeLists.txt trunk/libzypp/tests/sat/CMakeLists.txt trunk/libzypp/tests/zypp/CMakeLists.txt trunk/libzypp/zypp/CMakeLists.txt Modified: trunk/libzypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/CMakeLists.txt?rev=11571… ============================================================================== --- trunk/libzypp/CMakeLists.txt (original) +++ trunk/libzypp/CMakeLists.txt Tue Nov 4 16:10:56 2008 @@ -1,7 +1,7 @@ -PROJECT(libzypp) +PROJECT(LIBZYPP) SET( PACKAGE "libzypp" ) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked -SET( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ) +SET( CMAKE_MODULE_PATH ${LIBZYPP_SOURCE_DIR}/cmake/modules ) cmake_minimum_required(VERSION 2.6) # allow name libraries by name mixed with full @@ -11,7 +11,7 @@ endif(COMMAND cmake_policy) INCLUDE(ZyppCommon) -INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake ) +INCLUDE( ${LIBZYPP_SOURCE_DIR}/VERSION.cmake ) MATH( EXPR LIBZYPP_CURRENT "${LIBZYPP_MAJOR} * 100 + ${LIBZYPP_MINOR}" ) MATH( EXPR LIBZYPP_AGE "${LIBZYPP_MINOR} - ${LIBZYPP_COMPATMINOR}" ) @@ -127,12 +127,12 @@ MESSAGE(STATUS "version: ${VERSION}") MESSAGE(STATUS "Writing pkg-config file...") -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/libzypp.pc.cmake ${CMAKE_BINARY_DIR}/libzypp.pc @ONLY) -INSTALL( FILES ${CMAKE_BINARY_DIR}/libzypp.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) +CONFIGURE_FILE(${LIBZYPP_SOURCE_DIR}/libzypp.pc.cmake ${LIBZYPP_BINARY_DIR}/libzypp.pc @ONLY) +INSTALL( FILES ${LIBZYPP_BINARY_DIR}/libzypp.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) MESSAGE(STATUS "FindZypp.cmake will be installed in ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules") -INSTALL( FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindZypp.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules ) -INSTALL( FILES ${CMAKE_SOURCE_DIR}/cmake/modules/ZyppCommon.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules ) +INSTALL( FILES ${LIBZYPP_SOURCE_DIR}/cmake/modules/FindZypp.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules ) +INSTALL( FILES ${LIBZYPP_SOURCE_DIR}/cmake/modules/ZyppCommon.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules ) #################################################################### # config templates @@ -140,14 +140,14 @@ #################################################################### MESSAGE(STATUS "zypp.conf will be installed in ${SYSCONFDIR}/zypp") -INSTALL( FILES ${CMAKE_SOURCE_DIR}/zypp.conf DESTINATION ${SYSCONFDIR}/zypp ) +INSTALL( FILES ${LIBZYPP_SOURCE_DIR}/zypp.conf DESTINATION ${SYSCONFDIR}/zypp ) #install systemCheck MESSAGE(STATUS "systemCheck will be installed in ${SYSCONFDIR}/zypp") -INSTALL( FILES ${CMAKE_SOURCE_DIR}/systemCheck DESTINATION ${SYSCONFDIR}/zypp ) +INSTALL( FILES ${LIBZYPP_SOURCE_DIR}/systemCheck DESTINATION ${SYSCONFDIR}/zypp ) # logrotate config file -INSTALL( FILES ${CMAKE_SOURCE_DIR}/zypp-history.lr DESTINATION ${SYSCONFDIR}/logrotate.d ) +INSTALL( FILES ${LIBZYPP_SOURCE_DIR}/zypp-history.lr DESTINATION ${SYSCONFDIR}/logrotate.d ) #################################################################### # SUBDIRECTORIES # Modified: trunk/libzypp/devel/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/CMakeLists.txt?rev… ============================================================================== --- trunk/libzypp/devel/CMakeLists.txt (original) +++ trunk/libzypp/devel/CMakeLists.txt Tue Nov 4 16:10:56 2008 @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) +INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${LIBZYPP_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/devel/genclass.in ${CMAKE_BINARY_DIR}/devel/genclass @ONLY) +CONFIGURE_FILE(${LIBZYPP_SOURCE_DIR}/devel/genclass.in ${LIBZYPP_BINARY_DIR}/devel/genclass @ONLY) ADD_SUBDIRECTORY(devel.dmacvicar) ADD_SUBDIRECTORY(devel.ma) Modified: trunk/libzypp/devel/devel.jkupec/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.jkupec/CMake… ============================================================================== --- trunk/libzypp/devel/devel.jkupec/CMakeLists.txt (original) +++ trunk/libzypp/devel/devel.jkupec/CMakeLists.txt Tue Nov 4 16:10:56 2008 @@ -1,6 +1,6 @@ ADD_DEFINITIONS( -DSRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}" - -DTESTS_SRC_DIR="${CMAKE_SOURCE_DIR}/tests" + -DTESTS_SRC_DIR="${LIBZYPP_SOURCE_DIR}/tests" ) SET( bridge_SRCS Modified: trunk/libzypp/devel/devel.jsrain/yum/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.jsrain/yum/C… ============================================================================== --- trunk/libzypp/devel/devel.jsrain/yum/CMakeLists.txt (original) +++ trunk/libzypp/devel/devel.jsrain/yum/CMakeLists.txt Tue Nov 4 16:10:56 2008 @@ -1,6 +1,6 @@ ADD_SUBDIRECTORY( YUMParser.test ) -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/zypp/parser/yum ${CMAKE_SOURCE_DIR}/zypp ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ) +INCLUDE_DIRECTORIES( ${LIBZYPP_SOURCE_DIR}/zypp/parser/yum ${LIBZYPP_SOURCE_DIR}/zypp ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ) ########### install files ############### Modified: trunk/libzypp/doc/autodoc/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/doc/autodoc/CMakeLists.t… ============================================================================== --- trunk/libzypp/doc/autodoc/CMakeLists.txt (original) +++ trunk/libzypp/doc/autodoc/CMakeLists.txt Tue Nov 4 16:10:56 2008 @@ -8,9 +8,9 @@ SET( HAVE_DOT YES ) ENDIF ( NOT DOT ) -SET( ZYPP_SOURCE_DIR ${CMAKE_SOURCE_DIR}/zypp ) -SET( ZYPP_DOCINCLUDE_DIR ${CMAKE_SOURCE_DIR}/doc/autoinclude ) -SET( ZYPP_EXAMPLE_DIR ${CMAKE_SOURCE_DIR}/examples ) +SET( ZYPP_SOURCE_DIR ${LIBZYPP_SOURCE_DIR}/zypp ) +SET( ZYPP_DOCINCLUDE_DIR ${LIBZYPP_SOURCE_DIR}/doc/autoinclude ) +SET( ZYPP_EXAMPLE_DIR ${LIBZYPP_SOURCE_DIR}/examples ) SET( DOXYGEN_INPUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile ) SET( DOXYGEN_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/html/index.html ) Modified: trunk/libzypp/po/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/CMakeLists.txt?rev=11… ============================================================================== --- trunk/libzypp/po/CMakeLists.txt (original) +++ trunk/libzypp/po/CMakeLists.txt Tue Nov 4 16:10:56 2008 @@ -1,3 +1,3 @@ -FILE( GLOB LIBZYPP_PO_FILES ${CMAKE_SOURCE_DIR}/po/*.po ) -GETTEXT_CREATE_TRANSLATIONS( "${CMAKE_SOURCE_DIR}/po/zypp.pot" ${LIBZYPP_PO_FILES} ) \ No newline at end of file +FILE( GLOB LIBZYPP_PO_FILES ${LIBZYPP_SOURCE_DIR}/po/*.po ) +GETTEXT_CREATE_TRANSLATIONS( "${LIBZYPP_SOURCE_DIR}/po/zypp.pot" ${LIBZYPP_PO_FILES} ) \ No newline at end of file Modified: trunk/libzypp/tests/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/CMakeLists.txt?rev… ============================================================================== --- trunk/libzypp/tests/CMakeLists.txt (original) +++ trunk/libzypp/tests/CMakeLists.txt Tue Nov 4 16:10:56 2008 @@ -2,7 +2,7 @@ ADD_SUBDIRECTORY(lib) ENABLE_TESTING() -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/tests/lib ) +INCLUDE_DIRECTORIES( ${LIBZYPP_SOURCE_DIR}/tests/lib ) ADD_DEFINITIONS( -DTESTS_SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}" -DTESTS_BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}" ) Modified: trunk/libzypp/tests/lib/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/lib/CMakeLists.txt… ============================================================================== --- trunk/libzypp/tests/lib/CMakeLists.txt (original) +++ trunk/libzypp/tests/lib/CMakeLists.txt Tue Nov 4 16:10:56 2008 @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/vendor/shttpd ) +INCLUDE_DIRECTORIES( ${LIBZYPP_SOURCE_DIR}/vendor/shttpd ) ADD_LIBRARY(zypp_test_utils TestSetup.h Modified: trunk/libzypp/tests/repo/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/CMakeLists.tx… ============================================================================== --- trunk/libzypp/tests/repo/CMakeLists.txt (original) +++ trunk/libzypp/tests/repo/CMakeLists.txt Tue Nov 4 16:10:56 2008 @@ -2,6 +2,6 @@ ADD_SUBDIRECTORY( susetags ) # to find the KeyRingTest receiver -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/tests/zypp ) +INCLUDE_DIRECTORIES( ${LIBZYPP_SOURCE_DIR}/tests/zypp ) ADD_TESTS(RepoVariables OutdatedMetadata) Modified: trunk/libzypp/tests/sat/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/sat/CMakeLists.txt… ============================================================================== --- trunk/libzypp/tests/sat/CMakeLists.txt (original) +++ trunk/libzypp/tests/sat/CMakeLists.txt Tue Nov 4 16:10:56 2008 @@ -1,6 +1,6 @@ # to find the KeyRingTest receiver -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/tests/zypp ) +INCLUDE_DIRECTORIES( ${LIBZYPP_SOURCE_DIR}/tests/zypp ) ADD_TESTS(Solvable SolvParsing WhatProvides LookupAttr) Modified: trunk/libzypp/tests/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/CMakeLists.tx… ============================================================================== --- trunk/libzypp/tests/zypp/CMakeLists.txt (original) +++ trunk/libzypp/tests/zypp/CMakeLists.txt Tue Nov 4 16:10:56 2008 @@ -1,9 +1,9 @@ ADD_SUBDIRECTORY(base) # set the vendor.d paths correctly for the tests -SET(VENDOR_D "${CMAKE_SOURCE_DIR}/tests/zypp/data/Vendor/vendors.d") -FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/tests/zypp/data/Vendor") -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/tests/zypp/data/Vendor/zypp2.conf.cmake ${CMAKE_BINARY_DIR}/tests/zypp/data/Vendor/zypp2.conf @ONLY) +SET(VENDOR_D "${LIBZYPP_SOURCE_DIR}/tests/zypp/data/Vendor/vendors.d") +FILE(MAKE_DIRECTORY "${LIBZYPP_BINARY_DIR}/tests/zypp/data/Vendor") +CONFIGURE_FILE(${LIBZYPP_SOURCE_DIR}/tests/zypp/data/Vendor/zypp2.conf.cmake ${LIBZYPP_BINARY_DIR}/tests/zypp/data/Vendor/zypp2.conf @ONLY) ADD_TESTS( Arch Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=… ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Tue Nov 4 16:10:56 2008 @@ -876,5 +876,5 @@ INSTALL(TARGETS zypp LIBRARY DESTINATION ${LIB_INSTALL_DIR} ) # install XML schemas -FILE( GLOB YUM_SCHEMA_FILES ${CMAKE_SOURCE_DIR}/zypp/parser/yum/schema/*.rng ) +FILE( GLOB YUM_SCHEMA_FILES ${LIBZYPP_SOURCE_DIR}/zypp/parser/yum/schema/*.rng ) INSTALL(FILES ${YUM_SCHEMA_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/zypp/schema/yum" ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11570 - in /trunk/sat-solver: src/pool.c src/repo_solv.c src/solver.c tools/repo_rpmdb.c tools/repo_rpmmd.c
by mlschroe＠svn.opensuse.org 04 Nov '08

04 Nov '08

Author: mlschroe Date: Tue Nov 4 14:32:05 2008 New Revision: 11570 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11570&view=rev Log: - log more statistics Modified: trunk/sat-solver/src/pool.c trunk/sat-solver/src/repo_solv.c trunk/sat-solver/src/solver.c trunk/sat-solver/tools/repo_rpmdb.c trunk/sat-solver/tools/repo_rpmmd.c Modified: trunk/sat-solver/src/pool.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.c?rev=11570&… ============================================================================== --- trunk/sat-solver/src/pool.c (original) +++ trunk/sat-solver/src/pool.c Tue Nov 4 14:32:05 2008 @@ -356,6 +356,7 @@ pool->whatprovidesdataoff = off; pool->whatprovidesdataleft = extra; pool_shrink_whatprovides(pool); + POOL_DEBUG(SAT_DEBUG_STATS, "whatprovides memory used: %d K id array, %d K data\n", (pool->ss.nstrings + pool->nrels + WHATPROVIDES_BLOCK) / (1024/sizeof(Id)), (pool->whatprovidesdataoff + pool->whatprovidesdataleft) / (1024/sizeof(Id))); POOL_DEBUG(SAT_DEBUG_STATS, "createwhatprovides took %d ms\n", sat_timems(now)); } Modified: trunk/sat-solver/src/repo_solv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo_solv.c?rev=1… ============================================================================== --- trunk/sat-solver/src/repo_solv.c (original) +++ trunk/sat-solver/src/repo_solv.c Tue Nov 4 14:32:05 2008 @@ -537,11 +537,14 @@ Id stack[3 * 5]; int keydepth; int needchunk; /* need a new chunk of data */ + unsigned int now; struct _Stringpool *spool; Repodata data; + now = sat_timems(0); + memset(&data, 0, sizeof(data)); data.repo = repo; data.fp = fp; @@ -1363,6 +1366,10 @@ memset(&stubdata, 0, sizeof(stubdata)); repodata_search(&data, SOLVID_META, REPOSITORY_EXTERNAL, SEARCH_ARRAYSENTINEL, create_stub_cb, &stubdata); } + + POOL_DEBUG(SAT_DEBUG_STATS, "repo_add_solv took %d ms\n", sat_timems(now)); + POOL_DEBUG(SAT_DEBUG_STATS, "repo size: %d solvables\n", repo->nsolvables); + POOL_DEBUG(SAT_DEBUG_STATS, "repo memory used: %d K incore, %d K idarray\n", data.incoredatalen/1024, repo->idarraysize / (1024/sizeof(Id))); return 0; } Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=1157… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Tue Nov 4 14:32:05 2008 @@ -4078,6 +4078,7 @@ solv->rpmrules_end = solv->nrules; /* mark end of rpm rules */ solv->directdecisions = solv->decisionq.count; + POOL_DEBUG(SAT_DEBUG_STATS, "rpm rule memory usage: %d K\n", solv->nrules * sizeof(Rule) / 1024); POOL_DEBUG(SAT_DEBUG_STATS, "decisions so far: %d\n", solv->decisionq.count); POOL_DEBUG(SAT_DEBUG_STATS, "rpm rule creation took %d ms\n", sat_timems(now)); Modified: trunk/sat-solver/tools/repo_rpmdb.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmdb.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_rpmdb.c (original) +++ trunk/sat-solver/tools/repo_rpmdb.c Tue Nov 4 14:32:05 2008 @@ -1251,13 +1251,14 @@ Id oldcookietype = 0; Repodata *data; int count = 0, done = 0; + unsigned int now; + now = sat_timems(0); memset(&dbkey, 0, sizeof(dbkey)); memset(&dbdata, 0, sizeof(dbdata)); if (!rootdir) rootdir = ""; - if (!(flags & REPO_REUSE_REPODATA)) data = repo_add_repodata(repo, 0); @@ -1611,15 +1612,18 @@ sat_free(rpmids); } } - if (!(flags & REPO_NO_INTERNALIZE)) - repodata_internalize(data); - if (rpmhead) - sat_free(rpmhead); if (db) db->close(db, 0); dbenv->close(dbenv, 0); + if (rpmhead) + sat_free(rpmhead); + if (!(flags & REPO_NO_INTERNALIZE)) + repodata_internalize(data); if ((flags & RPMDB_REPORT_PROGRESS) != 0) pool_debug(pool, SAT_ERROR, "%%%% 100\n"); + POOL_DEBUG(SAT_DEBUG_STATS, "repo_add_rpmdb took %d ms\n", sat_timems(now)); + POOL_DEBUG(SAT_DEBUG_STATS, "repo size: %d solvables\n", repo->nsolvables); + POOL_DEBUG(SAT_DEBUG_STATS, "repo memory used: %d K incore, %d K idarray\n", data->incoredatalen/1024, repo->idarraysize / (1024/sizeof(Id))); } Modified: trunk/sat-solver/tools/repo_rpmmd.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmmd.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_rpmmd.c (original) +++ trunk/sat-solver/tools/repo_rpmmd.c Tue Nov 4 14:32:05 2008 @@ -1092,7 +1092,9 @@ int i, l; struct stateswitch *sw; Repodata *data; + unsigned int now; + now = sat_timems(0); if (!(flags & REPO_REUSE_REPODATA)) data = repo_add_repodata(repo, 0); else @@ -1146,4 +1148,7 @@ sat_free(pd.cscache); if (!(flags & REPO_NO_INTERNALIZE)) repodata_internalize(data); + POOL_DEBUG(SAT_DEBUG_STATS, "repo_add_rpmmd took %d ms\n", sat_timems(now)); + POOL_DEBUG(SAT_DEBUG_STATS, "repo size: %d solvables\n", repo->nsolvables); + POOL_DEBUG(SAT_DEBUG_STATS, "repo memory used: %d K incore, %d K idarray\n", data->incoredatalen/1024, repo->idarraysize / (1024/sizeof(Id))); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11569 - /trunk/libzypp/package/libzypp.changes
by jkupec＠svn.opensuse.org 04 Nov '08

04 Nov '08

Author: jkupec Date: Tue Nov 4 13:23:30 2008 New Revision: 11569 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11569&view=rev Log: - changes Modified: trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Tue Nov 4 13:23:30 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Nov 4 13:21:35 CET 2008 - jkupec(a)suse.cz + +- handle MediaTimeoutException also in MediaSetAccess::provideFile() + (bnc #439983) +- revision 11568 + +------------------------------------------------------------------- Mon Nov 3 15:30:53 CET 2008 - dmacvicar(a)suse.de - merge contributions by Jon Nelson, the patches resolve -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11568 - /trunk/libzypp/zypp/MediaSetAccess.cc
by jkupec＠svn.opensuse.org 04 Nov '08

04 Nov '08

Author: jkupec Date: Tue Nov 4 13:20:52 2008 New Revision: 11568 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11568&view=rev Log: - handle MediaTimeoutException also in MediaSetAccess::provideFile() (bnc #439983) Modified: trunk/libzypp/zypp/MediaSetAccess.cc Modified: trunk/libzypp/zypp/MediaSetAccess.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/MediaSetAccess.cc?r… ============================================================================== --- trunk/libzypp/zypp/MediaSetAccess.cc (original) +++ trunk/libzypp/zypp/MediaSetAccess.cc Tue Nov 4 13:20:52 2008 @@ -314,6 +314,10 @@ { reason = media::MediaChangeReport::WRONG; } + else if( typeid(excp) == typeid( media::MediaTimeoutException)) + { + reason = media::MediaChangeReport::IO_SOFT; + } // checkonly: only bother the user if wrong medium is in the drive if (checkonly && reason != media::MediaChangeReport::WRONG) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11567 - in /trunk/libzypp: package/libzypp.changes zypp/media/MediaCurl.cc
by dmacvicar＠svn.opensuse.org 03 Nov '08

03 Nov '08

Author: dmacvicar Date: Mon Nov 3 15:34:11 2008 New Revision: 11567 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11567&view=rev Log: merge contributions by Jon Nelson, thanks Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/media/MediaCurl.cc Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Mon Nov 3 15:34:11 2008 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Mon Nov 3 15:30:53 CET 2008 - dmacvicar(a)suse.de + +- merge contributions by Jon Nelson, the patches resolve + the following issues: +- disable the "Pragma: nocache" header which is automatically + used by curl. + re-enables the use of a caching http proxy (like squid or others) + and corrects (bnc #326208) +- don't generate an If-Modified-Since header if we don't have a + previous file to work with +- don't generate a Proxy-Authenticate header if one is not called + for. + +------------------------------------------------------------------- Fri Oct 31 14:01:57 CET 2008 - ma(a)suse.de - Do not save solver locks (by APPL_HIGH). Modified: trunk/libzypp/zypp/media/MediaCurl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaCurl.cc?… ============================================================================== --- trunk/libzypp/zypp/media/MediaCurl.cc (original) +++ trunk/libzypp/zypp/media/MediaCurl.cc Mon Nov 3 15:34:11 2008 @@ -658,10 +658,12 @@ } _proxyuserpwd = unEscape( _proxyuserpwd ); - ret = curl_easy_setopt( _curl, CURLOPT_PROXYUSERPWD, _proxyuserpwd.c_str() ); - if ( ret != 0 ) { - disconnectFrom(); - ZYPP_THROW(MediaCurlSetOptException(_url, _curlError)); + if ( ! _proxyuserpwd.empty() ) { + ret = curl_easy_setopt( _curl, CURLOPT_PROXYUSERPWD, _proxyuserpwd.c_str() ); + if ( ret != 0 ) { + disconnectFrom(); + ZYPP_THROW(MediaCurlSetOptException(_url, _curlError)); + } } } @@ -704,8 +706,18 @@ ZYPP_THROW(MediaCurlSetOptException(_url, _curlError)); } + _customHeaders = curl_slist_append(_customHeaders, "Pragma:"); + + if ( !_customHeaders ) { + ZYPP_THROW(MediaCurlInitException(_url)); + } + // now add the anonymous id header _customHeaders = curl_slist_append(_customHeaders, anonymousIdHeader()); + + if ( !_customHeaders ) { + ZYPP_THROW(MediaCurlInitException(_url)); + } ret = curl_easy_setopt ( _curl, CURLOPT_HTTPHEADER, _customHeaders ); @@ -1192,9 +1204,11 @@ } // set IFMODSINCE time condition (no download if not modified) - curl_easy_setopt(_curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); - curl_easy_setopt(_curl, CURLOPT_TIMEVALUE, PathInfo(target).mtime()); - + if( PathInfo(target).isExist() ) { + curl_easy_setopt(_curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); + curl_easy_setopt(_curl, CURLOPT_TIMEVALUE, PathInfo(target).mtime()); + } + string destNew = target.asString() + ".new.zypp.XXXXXX"; char *buf = ::strdup( destNew.c_str()); if( !buf) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11566 - /trunk/libzypp/tests/zypp/Fetcher_test.cc
by dmacvicar＠svn.opensuse.org 03 Nov '08

03 Nov '08

Author: dmacvicar Date: Mon Nov 3 15:34:09 2008 New Revision: 11566 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11566&view=rev Log: check that files are downloaded too Modified: trunk/libzypp/tests/zypp/Fetcher_test.cc Modified: trunk/libzypp/tests/zypp/Fetcher_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/Fetcher_test.… ============================================================================== --- trunk/libzypp/tests/zypp/Fetcher_test.cc (original) +++ trunk/libzypp/tests/zypp/Fetcher_test.cc Mon Nov 3 15:34:09 2008 @@ -34,6 +34,11 @@ fetcher.enqueueDir(OnMediaLocation("/complexdir"), true); fetcher.start( dest.path(), media ); fetcher.reset(); + + BOOST_CHECK( PathInfo(dest.path() + "/complexdir/subdir2").isExist() ); + BOOST_CHECK( PathInfo(dest.path() + "/complexdir/subdir2/subdir2-file1.txt").isExist() ); + BOOST_CHECK( PathInfo(dest.path() + "/complexdir/subdir1/subdir1-file1.txt").isExist() ); + BOOST_CHECK( PathInfo(dest.path() + "/complexdir/subdir1/subdir1-file2.txt").isExist() ); } } @@ -90,6 +95,12 @@ // enqueue is not digested fetcher.start( dest.path(), media ); fetcher.reset(); + + BOOST_CHECK( PathInfo(dest.path() + "/complexdir-broken/subdir2").isExist() ); + BOOST_CHECK( PathInfo(dest.path() + "/complexdir-broken/subdir2/subdir2-file1.txt").isExist() ); + BOOST_CHECK( PathInfo(dest.path() + "/complexdir-broken/subdir1/subdir1-file1.txt").isExist() ); + BOOST_CHECK( PathInfo(dest.path() + "/complexdir-broken/subdir1/subdir1-file2.txt").isExist() ); + } } @@ -177,6 +188,7 @@ fetcher.enqueue(loc); fetcher.start(dest.path(), media); fetcher.reset(); + BOOST_CHECK( PathInfo(dest.path() + "/contentindex/subdir1/subdir1-file1.txt").isExist() ); } } @@ -194,6 +206,8 @@ fetcher.enqueue(loc); fetcher.start(dest.path(), media); fetcher.reset(); + BOOST_CHECK( PathInfo(dest.path() + "/contentindex-broken-digest/subdir1/subdir1-file1.txt").isExist() ); + // now retrieve a file that is modified, so the checksum has to fail loc = OnMediaLocation("/contentindex-broken-digest/subdir1/subdir1-file2.txt",1); fetcher.enqueue(loc); @@ -240,6 +254,8 @@ fetcher.enqueue(loc); fetcher.start( dest.path(), media ); fetcher.reset(); + BOOST_CHECK( PathInfo(dest.path() + "/contentindex-broken-digest/subdir1/subdir1-file2.txt").isExist() ); + } } @@ -265,6 +281,12 @@ fetcher.reset(); + BOOST_CHECK( PathInfo(dest.path() + "/complexdir/subdir2").isExist() ); + BOOST_CHECK( PathInfo(dest.path() + "/complexdir/subdir2/subdir2-file1.txt").isExist() ); + BOOST_CHECK( PathInfo(dest.path() + "/complexdir/subdir1/subdir1-file1.txt").isExist() ); + BOOST_CHECK( PathInfo(dest.path() + "/complexdir/subdir1/subdir1-file2.txt").isExist() ); + + fetcher.enqueueDir(OnMediaLocation("/complexdir-broken"), true); BOOST_CHECK_THROW( fetcher.start( dest.path(), media ), Exception); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0