December 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r11853 - /trunk/sat-solver/bindings/satsolver.i
by kkaempf＠svn.opensuse.org 03 Dec '08

03 Dec '08

Author: kkaempf Date: Wed Dec 3 16:21:14 2008 New Revision: 11853 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11853&view=rev Log: add Python typemap for XSolvable ** Modified: trunk/sat-solver/bindings/satsolver.i Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Wed Dec 3 16:21:14 2008 @@ -301,6 +301,26 @@ } #endif +#if defined(SWIGPYTHON) +/* + * XSolvable array to Python + */ +%typemap(out) XSolvable ** { + int n, i; + + for (n = 0; $1[n];) + n++; + + $result = PyList_New(n); + + for (i = 0; i < n; i++) { + PyObject *item = SWIG_NewPointerObj(SWIG_as_voidptr($1[i]), SWIGTYPE_p__Solvable, 0); + PyList_SetItem($result, i, item); + } + free($1); +} +#endif + typedef int Id; typedef unsigned int Offset; -- 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] r11852 - /trunk/sat-solver/bindings/solvable.i
by kkaempf＠svn.opensuse.org 03 Dec '08

03 Dec '08

Author: kkaempf Date: Wed Dec 3 15:33:23 2008 New Revision: 11852 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11852&view=rev Log: put declarations before code Modified: trunk/sat-solver/bindings/solvable.i Modified: trunk/sat-solver/bindings/solvable.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/solvable.i?r… ============================================================================== --- trunk/sat-solver/bindings/solvable.i (original) +++ trunk/sat-solver/bindings/solvable.i Wed Dec 3 15:33:23 2008 @@ -180,6 +180,9 @@ #endif { Swig_Type result = Swig_Null; + Id key; + Solvable *s; + Dataiterator di; #if defined(SWIGRUBY) char *name; @@ -198,13 +201,11 @@ SWIG_exception( SWIG_ValueError, "Attribute name missing" ); /* key existing in pool ? */ - Id key; key = str2id( $self->pool, name, 0); if (key == ID_NULL) SWIG_exception( SWIG_ValueError, "No such attribute name" ); - Solvable *s = xsolvable_solvable($self); - Dataiterator di; + s = xsolvable_solvable($self); dataiterator_init(&di, s->repo->pool, s->repo, $self->id, key, 0, 0); if (dataiterator_step(&di)) { @@ -229,8 +230,8 @@ { Solvable *s = xsolvable_solvable($self); Dataiterator di; - dataiterator_init(&di, s->repo->pool, s->repo, $self->id, 0, 0, SEARCH_NO_STORAGE_SOLVABLE); VALUE value; + dataiterator_init(&di, s->repo->pool, s->repo, $self->id, 0, 0, SEARCH_NO_STORAGE_SOLVABLE); while (dataiterator_step(&di)) { value = dataiterator_value ( &di ); @@ -241,8 +242,8 @@ { Solvable *s = xsolvable_solvable($self); Dataiterator di; - dataiterator_init(&di, s->repo->pool, s->repo, $self->id, str2id(s->repo->pool,name,0), 0, 0); VALUE value; + dataiterator_init(&di, s->repo->pool, s->repo, $self->id, str2id(s->repo->pool,name,0), 0, 0); while (dataiterator_step(&di)) { value = dataiterator_value ( &di ); -- 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] r11851 - /trunk/sat-solver/bindings/python/CMakeLists.txt
by kkaempf＠svn.opensuse.org 03 Dec '08

03 Dec '08

Author: kkaempf Date: Wed Dec 3 15:32:58 2008 New Revision: 11851 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11851&view=rev Log: Pythons pointer mangling needs -fno-strict-aliasing Modified: trunk/sat-solver/bindings/python/CMakeLists.txt Modified: trunk/sat-solver/bindings/python/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/CMake… ============================================================================== --- trunk/sat-solver/bindings/python/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/python/CMakeLists.txt Wed Dec 3 15:32:58 2008 @@ -34,6 +34,9 @@ SET(binding_SRCS "${SWIG_OUTPUT}" "${CMAKE_SOURCE_DIR}/tools/repo_rpmdb.c" ) +# Py_True and Py_False are a bit tricky +ADD_DEFINITIONS( -fno-strict-aliasing ) + ADD_LIBRARY( satsolver_python SHARED ${binding_SRCS} ) # name it '_satsolver.so' # and don't prefix with 'lib' -- 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] r11850 - /trunk/sat-solver/CMakeLists.txt
by kkaempf＠svn.opensuse.org 03 Dec '08

03 Dec '08

Author: kkaempf Date: Wed Dec 3 14:23:53 2008 New Revision: 11850 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11850&view=rev Log: make SWIG optional Modified: trunk/sat-solver/CMakeLists.txt Modified: trunk/sat-solver/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/CMakeLists.txt?rev=11… ============================================================================== --- trunk/sat-solver/CMakeLists.txt (original) +++ trunk/sat-solver/CMakeLists.txt Wed Dec 3 14:23:53 2008 @@ -117,10 +117,6 @@ #################################################################### MESSAGE(STATUS "Looking modules in ${CMAKE_MODULE_PATH}") -#FIND_PROGRAM(SWIG_EXECUTABLE -# NAMES swig-1.3 swig -# PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin -#) set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall" ) set ( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -g -O3" ) @@ -132,10 +128,19 @@ ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(doc) -FIND_PACKAGE(SWIG REQUIRED) +FIND_PACKAGE(SWIG) IF ( SWIG_FOUND ) ADD_SUBDIRECTORY(bindings) +ELSE ( SWIG_FOUND ) + # for older version of swig/cmake + FIND_PROGRAM(SWIG_EXECUTABLE + NAMES swig-1.3 swig + PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin + ) + IF ( SWIG_EXECUTABLE ) + ADD_SUBDIRECTORY(bindings) + ENDIF ( SWIG_EXECUTABLE ) ENDIF ( SWIG_FOUND ) MESSAGE(STATUS "version: ${VERSION}") -- 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] r11849 - /trunk/sat-solver/tests/core/CMakeLists.txt
by kkaempf＠svn.opensuse.org 03 Dec '08

03 Dec '08

Author: kkaempf Date: Wed Dec 3 14:18:24 2008 New Revision: 11849 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11849&view=rev Log: skip test if 'check' not found Modified: trunk/sat-solver/tests/core/CMakeLists.txt Modified: trunk/sat-solver/tests/core/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tests/core/CMakeLists… ============================================================================== --- trunk/sat-solver/tests/core/CMakeLists.txt (original) +++ trunk/sat-solver/tests/core/CMakeLists.txt Wed Dec 3 14:18:24 2008 @@ -1,3 +1,6 @@ - +IF (CHECK_FOUND) ADD_TESTS(solv) +ELSE (CHECK_FOUND) + MESSAGE(STATUS "**** 'check' not found, skipping tests") +ENDIF (CHECK_FOUND) -- 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] r11848 - /trunk/sat-solver/bindings/CMakeLists.txt
by kkaempf＠svn.opensuse.org 03 Dec '08

03 Dec '08

Author: kkaempf Date: Wed Dec 3 14:17:30 2008 New Revision: 11848 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11848&view=rev Log: remove check for swig, bindings/ only gets included when swig is found Modified: trunk/sat-solver/bindings/CMakeLists.txt Modified: trunk/sat-solver/bindings/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/CMakeLists.t… ============================================================================== --- trunk/sat-solver/bindings/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/CMakeLists.txt Wed Dec 3 14:17:30 2008 @@ -4,8 +4,6 @@ ENABLE_TESTING() -FIND_PACKAGE(SWIG REQUIRED) - MESSAGE(STATUS "Found SWIG version ${SWIG_VERSION}") # -- 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] r11847 - /trunk/sat-solver/package/libsatsolver.spec.in
by kkaempf＠svn.opensuse.org 03 Dec '08

03 Dec '08

Author: kkaempf Date: Wed Dec 3 13:26:12 2008 New Revision: 11847 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11847&view=rev Log: explicity require graphviz on pre-11.0 SUSE systems Modified: trunk/sat-solver/package/libsatsolver.spec.in Modified: trunk/sat-solver/package/libsatsolver.spec.in URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.… ============================================================================== --- trunk/sat-solver/package/libsatsolver.spec.in (original) +++ trunk/sat-solver/package/libsatsolver.spec.in Wed Dec 3 13:26:12 2008 @@ -19,6 +19,9 @@ %endif %if 0%{?suse_version} BuildRequires: libexpat-devel +%if 0%{?suse_version} < 1100 +BuildRequires: graphviz +%endif %else BuildRequires: expat-devel %endif -- 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] r11846 - /trunk/sat-solver/cmake/modules/FindCheck.cmake
by kkaempf＠svn.opensuse.org 03 Dec '08

03 Dec '08

Author: kkaempf Date: Wed Dec 3 13:23:44 2008 New Revision: 11846 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11846&view=rev Log: FindPackageHandleStandardArgs needs cmake > 2.4 Modified: trunk/sat-solver/cmake/modules/FindCheck.cmake Modified: trunk/sat-solver/cmake/modules/FindCheck.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/cmake/modules/FindChe… ============================================================================== --- trunk/sat-solver/cmake/modules/FindCheck.cmake (original) +++ trunk/sat-solver/cmake/modules/FindCheck.cmake Wed Dec 3 13:23:44 2008 @@ -9,10 +9,13 @@ # Look for the library. FIND_LIBRARY(CHECK_LIBRARY NAMES check) -# handle the QUIETLY and REQUIRED arguments and set CHECK_FOUND to TRUE if -# all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Check "Please install 'check' and 'check-devel' packages" CHECK_LIBRARY CHECK_INCLUDE_DIR) +IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERISION} GREATER 2.4) + # handle the QUIETLY and REQUIRED arguments and set CHECK_FOUND to TRUE if + # all listed variables are TRUE + INCLUDE(FindPackageHandleStandardArgs) + + FIND_PACKAGE_HANDLE_STANDARD_ARGS(Check "Please install 'check' and 'check-devel' packages" CHECK_LIBRARY CHECK_INCLUDE_DIR) +ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERISION} GREATER 2.4) IF(CHECK_FOUND) SET( CHECK_LIBRARIES ${CHECK_LIBRARY} ) -- 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] r11845 - in /trunk/libzypp: VERSION.cmake devel/devel.ma/Iorder.cc package/libzypp.changes zypp/sat/WhatObsoletes.h zypp/solver/detail/InstallOrder.cc
by mlandres＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: mlandres Date: Mon Dec 1 19:42:47 2008 New Revision: 11845 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11845&view=rev Log: - Fix install order computation losing some installed packages pre-requirements. (bnc #439802) Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/devel/devel.ma/Iorder.cc trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/sat/WhatObsoletes.h trunk/libzypp/zypp/solver/detail/InstallOrder.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11845&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Mon Dec 1 19:42:47 2008 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") SET(LIBZYPP_MINOR "24") -SET(LIBZYPP_PATCH "4") +SET(LIBZYPP_PATCH "5") # -# LAST RELEASED: 5.24.4 (23) +# LAST RELEASED: 5.24.5 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= Modified: trunk/libzypp/devel/devel.ma/Iorder.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Iorder.cc… ============================================================================== --- trunk/libzypp/devel/devel.ma/Iorder.cc (original) +++ trunk/libzypp/devel/devel.ma/Iorder.cc Mon Dec 1 19:42:47 2008 @@ -5,12 +5,50 @@ #include "zypp/pool/GetResolvablesToInsDel.h" -Pathname mroot( "/tmp/Bb" ); -TestSetup test( mroot, Arch_ppc64 ); +void Dbg( ui::Selectable::Ptr s ) +{ + SEC << dump(s) << endl; + if ( s->installedObj() ) + { + PoolItem pi( s->installedObj() ); + DBG << pi.satSolvable().obsoletes() << endl; + sat::WhatObsoletes obs( pi ); + INT << "WhatObsoletes " << pi << " " << obs << endl; + } + if ( s->candidateObj() ) + { + PoolItem pi( s->candidateObj() ); + DBG << pi.satSolvable().obsoletes() << endl; + sat::WhatObsoletes obs( pi ); + INT << "WhatObsoletes " << pi << " " << obs << endl; + } + +} + +/////////////////////////////////////////////////////////////////// + +static std::string appname( "ToolIorder" ); + +void message( const std::string & msg_r ) +{ + cerr << "*** " << msg_r << endl; +} + +int usage( const std::string & msg_r = std::string(), int exit_r = 100 ) +{ + if ( ! msg_r.empty() ) + { + cerr << endl; + message( msg_r ); + cerr << endl; + } + cerr << "Usage: " << appname << "[OPTIONS] TESTCASE" << endl; + cerr << " Load testcase and analyze install order." << endl; + return exit_r; +} + +/////////////////////////////////////////////////////////////////// -#define LCStack "IOrder::Stack" -#define LCCache "IOrder::Cache" -#define LCVerbose "IOrder::Verbose" bool progressReceiver( const ProgressData & v ) { @@ -18,6 +56,12 @@ return true; } +/////////////////////////////////////////////////////////////////// + +#define LCStack "IOrder::Stack" +#define LCCache "IOrder::Cache" +#define LCVerbose "IOrder::Verbose" + struct RunnableCache { typedef std::tr1::unordered_map<sat::Solvable,TriBool> CacheType; @@ -177,7 +221,7 @@ if ( _stack.back() == solv_r ) { _stack.pop_back(); - _ltag = str::form( "[%0l4u]", _stack.size() ); + _ltag = str::form( "[%04lu]", _stack.size() ); return true; } // stack corrupted? @@ -226,7 +270,7 @@ USR << "Solve " << run++ << endl; bool rres = false; { - //zypp::base::LogControl::TmpLineWriter shutUp; + zypp::base::LogControl::TmpLineWriter shutUp; rres = getZYpp()->resolver()->resolvePool(); } if ( ! rres ) @@ -239,34 +283,19 @@ return true; } -bool verify() +void display( const pool::GetResolvablesToInsDel & collect, std::set<IdString> interested ) { - bool rres = solve(); - ResPool pool( test.pool() ); - for_( it, make_filter_begin<resfilter::ByTransact>(pool), - make_filter_end<resfilter::ByTransact>(pool) ) + if ( ! interested.empty() ) { - if ( it->status().transacts() && - it->status().isBySolver() ) + USR << "======================================================================" << endl; + USR << "=== INTERESTED" << endl; + USR << "======================================================================" << endl; + for_( it, interested.begin(), interested.end() ) { - WAR << "MISSING " << *it << endl; + MIL << dump(ui::Selectable::get( *it )) << endl; } } - return rres; -} - -inline void save() -{ - test.poolProxy().saveState(); -} - -inline void restore() -{ - test.poolProxy().restoreState(); -} -void display( const pool::GetResolvablesToInsDel & collect, std::set<IdString> interested ) -{ USR << "======================================================================" << endl; USR << "=== DELETE" << endl; USR << "======================================================================" << endl; @@ -331,6 +360,13 @@ rcache.clear(); + for_( it, p->installedBegin(), p->installedEnd() ) + { + if ( ! rcache.isInstallable( *it ) ) + { + USR << "FAILED OLD " << *it << endl; + } + } sat::WhatObsoletes obs( *it ); for_( it, obs.begin(), obs.end() ) { @@ -340,6 +376,7 @@ } } + if ( ! rcache.isInstallable( *it ) ) { USR << "FAILED INS " << *it << endl; @@ -371,48 +408,69 @@ int main( int argc, char * argv[] ) { INT << "===[START]==========================================" << endl; + appname = Pathname::basename( argv[0] ); + --argc; + ++argv; + + if ( ! argc ) + { + return usage(); + } - Pathname mroot( "/tmp/Bb" ); - TestSetup test( mroot, Arch_i686 ); // <<< arch + /////////////////////////////////////////////////////////////////// - ResPool pool( test.pool() ); + Pathname mtest( "/suse/ma/BUGS/439802/bug439802/YaST2/solverTestcase" ); + Arch march( Arch_ppc64 ); + + while ( argc ) + { + --argc; + ++argv; + } + + if ( mtest.empty() ) + { + return usage( "Missing Testcase", 102 ); + } + + /////////////////////////////////////////////////////////////////// + + TestSetup test( march ); + ResPool pool( test.pool() ); sat::Pool satpool( test.satpool() ); { zypp::base::LogControl::TmpLineWriter shutUp; test.loadTarget(); - test.loadTestcaseRepos( "/suse/ma/BUGS/153548/YaST2/solverTestcase" ); // <<< repos + test.loadTestcaseRepos( mtest ); // <<< repos } - save(); - + test.poolProxy().saveState(); { // <<< transaction zypp::base::LogControl::TmpLineWriter shutUp; - getPi<Product>( "SUSE_SLED" ).status().setTransact( true, ResStatus::USER ); - getPi<Package>( "kernel-pae" ).status().setTransact( true, ResStatus::USER ); - getPi<Package>( "sled-release" ).status().setTransact( true, ResStatus::USER ); - getPi<Pattern>( "apparmor" ).status().setTransact( true, ResStatus::USER ); - getPi<Pattern>( "desktop-base" ).status().setTransact( true, ResStatus::USER ); - getPi<Pattern>( "desktop-gnome" ).status().setTransact( true, ResStatus::USER ); - getPi<Pattern>( "x11" ).status().setTransact( true, ResStatus::USER ); + getPi<Product>( "SUSE_SLES", Edition("11-0"), Arch_ppc64 ).status().setTransact( true, ResStatus::USER ); + vdumpPoolStats( USR << "Transacting:"<< endl, + make_filter_begin<resfilter::ByTransact>(pool), + make_filter_end<resfilter::ByTransact>(pool) ) << endl; upgrade(); } vdumpPoolStats( USR << "Transacting:"<< endl, make_filter_begin<resfilter::ByTransact>(pool), make_filter_end<resfilter::ByTransact>(pool) ) << endl; + pool::GetResolvablesToInsDel collect( pool, pool::GetResolvablesToInsDel::ORDER_BY_MEDIANR ); - USR << ui::Selectable::get( "libtiff" ) << endl; - restore(); + + test.poolProxy().restoreState(); { - //base::LogControl::TmpLineWriter shutUp( new log::FileLineWriter( "iorder.log" ) ); + base::LogControl::TmpLineWriter shutUp( new log::FileLineWriter( "iorder.log" ) ); std::set<IdString> interested; - interested.insert( IdString("libtiff") ); + //interested.insert( IdString("fillup") ); display( collect, interested ); } - INT << "===[END]============================================" << endl << endl; + INT << "===[END]============================================" << endl << endl; zypp::base::LogControl::TmpLineWriter shutUp; return 0; } 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 Dec 1 19:42:47 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Dec 1 19:38:24 CET 2008 - ma(a)suse.de + +- Fix install order computation losing some installed packages + pre-requirements. (bnc #439802) +- revision 11845 +- version 5.24.5 (23) + +------------------------------------------------------------------- Fri Nov 28 16:33:56 CET 2008 - ma(a)suse.de - Prune soft locks to prevent installation but not update of Modified: trunk/libzypp/zypp/sat/WhatObsoletes.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/WhatObsoletes.h… ============================================================================== --- trunk/libzypp/zypp/sat/WhatObsoletes.h (original) +++ trunk/libzypp/zypp/sat/WhatObsoletes.h Mon Dec 1 19:42:47 2008 @@ -33,6 +33,8 @@ * * \code * \endcode + * + * \todo Add flag to also add any installed version to the containter. */ class WhatObsoletes : public SolvIterMixin<WhatObsoletes,detail::WhatProvidesIterator>, protected detail::PoolMember Modified: trunk/libzypp/zypp/solver/detail/InstallOrder.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Insta… ============================================================================== --- trunk/libzypp/zypp/solver/detail/InstallOrder.cc (original) +++ trunk/libzypp/zypp/solver/detail/InstallOrder.cc Mon Dec 1 19:42:47 2008 @@ -197,6 +197,13 @@ // items prereq CapabilitySet prq( item->dep(Dep::PREREQUIRES).begin(), item->dep(Dep::PREREQUIRES).end() ); + // an installed items prereq (in case they are reqired for uninstall scripts) + ui::Selectable::Ptr sel( ui::Selectable::get( item ) ); + for_( it, sel->installedBegin(), sel->installedEnd() ) + { + Capabilities p( it->satSolvable().prerequires() ); + prq.insert( p.begin(), p.end() ); + } // any obsoleted items prereq (in case they are reqired for uninstall scripts) sat::WhatObsoletes obs( item ); for_( it, obs.begin(), obs.end() ) -- 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] r11844 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: jkupec Date: Mon Dec 1 16:53:05 2008 New Revision: 11844 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11844&view=rev Log: - changes Modified: trunk/zypper/package/zypper.changes Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Mon Dec 1 16:53:05 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 1 16:53:29 CET 2008 - jkupec(a)suse.cz + +- fixed handling of source-install -d and -D options (bnc #428131) +- r11843 + +------------------------------------------------------------------- Fri Nov 28 18:28:15 CET 2008 - jkupec(a)suse.cz - translations update -- 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] r11843 - in /trunk/zypper/src: Zypper.cc misc.cc misc.h
by jkupec＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: jkupec Date: Mon Dec 1 16:51:34 2008 New Revision: 11843 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11843&view=rev Log: - fixed handling of source-install -d and -D options (bnc #428131) Modified: trunk/zypper/src/Zypper.cc trunk/zypper/src/misc.cc trunk/zypper/src/misc.h Modified: trunk/zypper/src/Zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?rev=11843&r… ============================================================================== --- trunk/zypper/src/Zypper.cc (original) +++ trunk/zypper/src/Zypper.cc Mon Dec 1 16:51:34 2008 @@ -3165,14 +3165,15 @@ if (exitCode() != ZYPPER_EXIT_OK) return; init_target(*this); - if (!copts.count("no-build-deps")) - load_target_resolvables(*this); + // if (!copts.count("no-build-deps")) // if target resolvables are not read, solver produces a weird result + load_target_resolvables(*this); load_repo_resolvables(*this); - if (!copts.count("no-build-deps")) + if (copts.count("no-build-deps")) + mark_src_pkgs(*this); + else build_deps_install(*this); - if (!copts.count("build-deps-only")) - find_src_pkgs(*this); + solve_and_commit(*this); break; } Modified: trunk/zypper/src/misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/misc.cc?rev=11843&r1=… ============================================================================== --- trunk/zypper/src/misc.cc (original) +++ trunk/zypper/src/misc.cc Mon Dec 1 16:51:34 2008 @@ -354,17 +354,20 @@ DBG << format("Injecting build requieres for source package %s-%s") % srcpkg->name() % srcpkg->edition() << endl; - // add all src requires to pool DEPRECATED: srcpakcages will be in - // the pool (together with their build-deps) like normal packages - // so only require the srcpackage - /* - for_( itc, srcpkg->dep(Dep::REQUIRES).begin(), srcpkg->dep(Dep::REQUIRES).end() ) + // install build depenendcies only + if (zypper.cOpts().count("build-deps-only")) + for_(itc, srcpkg->requires().begin(), srcpkg->requires().end()) + { + God->resolver()->addRequire(*itc); + DBG << "requiring: " << *itc << endl; + } + // install the source package with build deps + else { - God->resolver()->addRequire(*itc); - DBG << "added req: " << *itc << endl; - }*/ - God->resolver()->addRequire(Capability(srcpkg->name(), Rel::EQ, srcpkg->edition(), ResKind::srcpackage)); - //installer.item.status().setToBeInstalled( zypp::ResStatus::USER ); + Capability cap(srcpkg->name(), Rel::EQ, srcpkg->edition(), ResKind::srcpackage); + God->resolver()->addRequire(cap); + DBG << "requiring: " << cap << endl; + } } else { @@ -375,8 +378,7 @@ } } - -void find_src_pkgs(Zypper & zypper) +void mark_src_pkgs(Zypper & zypper) { /* * Workflow: Modified: trunk/zypper/src/misc.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/misc.h?rev=11843&r1=1… ============================================================================== --- trunk/zypper/src/misc.h (original) +++ trunk/zypper/src/misc.h Mon Dec 1 16:51:34 2008 @@ -17,8 +17,8 @@ * Loops through resolvables, checking if there is license to confirm. When * run interactively, it displays a dialog, otherwise it answers automatically * according to --auto-agree-with-licenses present or not present. - * - * \returns true if all licenses have been confirmed, false otherwise. + * + * \returns true if all licenses have been confirmed, false otherwise. */ bool confirm_licenses(Zypper & zypper); @@ -37,15 +37,25 @@ /** - * Find source packages by names specified as arguments. + * Find source packages by names specified as arguments and enqueue them + * for installation. + * + * \todo this will get deprecated after commit refactoring + * \note we still need to be able to install the source package alone + * (without build-deps, which are listed as 'requires' of the srcpackage) */ -void find_src_pkgs(Zypper & zypper); +void mark_src_pkgs(Zypper & zypper); + /** - * Install source packages found by \ref find_src_pkgs. + * Install source packages found by \ref mark_src_pkgs. + * \todo this uses ZYpp->installSrcPackage(srcpkg) - if it is to be gone + * during the zypp commit refactoring, we need a replacement */ void install_src_pkgs(Zypper & zypper); + /** - * Inject requirements of source packages' build dependencies to the pool. + * Inject requirements of a source package or its build dependencies (depending + * on command line options) to the pool. */ void build_deps_install(Zypper & zypper); -- 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] r11842 - /trunk/sat-solver/package/libsatsolver.changes
by mlschroe＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: mlschroe Date: Mon Dec 1 11:50:42 2008 New Revision: 11842 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11842&view=rev Log: - changes Modified: trunk/sat-solver/package/libsatsolver.changes Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.… ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Mon Dec 1 11:50:42 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Dec 1 11:50:12 CET 2008 - mls(a)suse.de + +- prefer patterns again until there's a real fix [bnc#450226] + +------------------------------------------------------------------- Mon Dec 1 11:13:55 CET 2008 - mls(a)suse.de - susetags: fix file dependency parsing [bnc#450286] -- 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] r11841 - /trunk/sat-solver/tests/solver/data.libzypp/real-life-tests/11.0beta1-gnome-test.solution
by mlschroe＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: mlschroe Date: Mon Dec 1 11:49:40 2008 New Revision: 11841 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11841&view=rev Log: - update test result Modified: trunk/sat-solver/tests/solver/data.libzypp/real-life-tests/11.0beta1-gnome-test.solution Modified: trunk/sat-solver/tests/solver/data.libzypp/real-life-tests/11.0beta1-gnome-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tests/solver/data.lib… ============================================================================== --- trunk/sat-solver/tests/solver/data.libzypp/real-life-tests/11.0beta1-gnome-test.solution (original) +++ trunk/sat-solver/tests/solver/data.libzypp/real-life-tests/11.0beta1-gnome-test.solution Mon Dec 1 11:49:40 2008 @@ -248,6 +248,8 @@ >!> install galago-sharp-0.5.0-216.noarch[openSUSE-DVD 11.0] >!> install gawk-3.1.5h-29.i586[openSUSE-DVD 11.0] >!> install gcalctool-5.22.1-3.i586[openSUSE-DVD 11.0] +>!> install gcc-gij-4.3-30.i586[openSUSE-DVD 11.0] +>!> install gcc43-gij-4.3.1_20080409-3.i586[openSUSE-DVD 11.0] >!> install gconf-editor-2.22.0-13.i586[openSUSE-DVD 11.0] >!> install gconf-sharp2-2.20.0-1.i586[openSUSE-DVD 11.0] >!> install gconf2-2.22.0-13.i586[openSUSE-DVD 11.0] @@ -403,6 +405,7 @@ >!> install iputils-ss021109-257.i586[openSUSE-DVD 11.0] >!> install iso-codes-2.0-4.noarch[openSUSE-DVD 11.0] >!> install iso_ent-2000.11.03-769.noarch[openSUSE-DVD 11.0] +>!> install java-1_5_0-gcj-compat-1.5.0.0-49.i586[openSUSE-DVD 11.0] >!> install java-1_6_0-sun-1.6.0.u5-5.i586[openSUSE-DVD 11.0] >!> install java-1_6_0-sun-plugin-1.6.0.u5-5.i586[openSUSE-DVD 11.0] >!> install joe-3.5-94.i586[openSUSE-DVD 11.0] @@ -473,6 +476,8 @@ >!> install libgail-gnome-1.20.0-86.i586[openSUSE-DVD 11.0] >!> install libgalago-0.5.2-101.i586[openSUSE-DVD 11.0] >!> install libgcc43-4.3.1_20080409-2.i586[openSUSE-DVD 11.0] +>!> install libgcj43-4.3.1_20080409-3.i586[openSUSE-DVD 11.0] +>!> install libgcj43-jar-4.3.1_20080409-3.i586[openSUSE-DVD 11.0] >!> install libgcrypt11-1.4.0-3.i586[openSUSE-DVD 11.0] >!> install libgda-3.1.2-23.i586[openSUSE-DVD 11.0] >!> install libgda-3_0-3.1.2-23.i586[openSUSE-DVD 11.0] @@ -1042,4 +1047,4 @@ >!> install zlib-1.2.3-105.i586[openSUSE-DVD 11.0] >!> install zsh-4.3.6-5.i586[openSUSE-DVD 11.0] >!> install zypper-0.11.0-3.i586[openSUSE-DVD 11.0] ->!> installs=1037, upgrades=0, uninstalls=0 +>!> installs=1042, upgrades=0, uninstalls=0 -- 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] r11840 - /trunk/sat-solver/src/solver.c
by mlschroe＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: mlschroe Date: Mon Dec 1 11:49:21 2008 New Revision: 11840 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11840&view=rev Log: - prefer patterns again [bnc#450226] Modified: trunk/sat-solver/src/solver.c Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=1184… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Mon Dec 1 11:49:21 2008 @@ -2911,6 +2911,14 @@ if (dq.count > 1) policy_filter_unwanted(solv, &dq, POLICY_MODE_RECOMMEND); p = dq.elements[0]; + /* prefer recommended patterns (bnc#450226) */ + /* real fix is to minimize recommended packages as well */ + for (i = 0; i < dq.count; i++) + if (!strncmp(id2str(pool, pool->solvables[dq.elements[i]].name), "pattern:", 8)) + { + p = dq.elements[i]; + break; + } POOL_DEBUG(SAT_DEBUG_POLICY, "installing recommended %s\n", solvable2str(pool, pool->solvables + p)); queue_push(&solv->recommendations, p); level = setpropagatelearn(solv, level, p, 0); -- 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] r11839 - /branches/SuSE-Linux-11_0-Branch/sat-solver/package/libsatsolver.changes
by mlschroe＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: mlschroe Date: Mon Dec 1 11:17:25 2008 New Revision: 11839 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11839&view=rev Log: - changes Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/package/libsatsolver.changes Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-so… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/package/libsatsolver.changes (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/package/libsatsolver.changes Mon Dec 1 11:17:25 2008 @@ -1,8 +1,14 @@ ------------------------------------------------------------------- +Mon Dec 1 11:16:30 CET 2008 - mls(a)suse.de + +- backport file dependency parsing fix [bnc#450286] +- backport =Vnd support +- 0.9.6 + +------------------------------------------------------------------- Wed Nov 26 15:05:18 CET 2008 - mls(a)suse.de - backport patch conflict handling change [bnc#447986] -- 0.9.6 ------------------------------------------------------------------- Wed Oct 15 18:16:59 CEST 2008 - mls(a)suse.de -- 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] r11838 - /trunk/sat-solver/package/libsatsolver.changes
by mlschroe＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: mlschroe Date: Mon Dec 1 11:14:33 2008 New Revision: 11838 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11838&view=rev Log: - changes Modified: trunk/sat-solver/package/libsatsolver.changes Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.… ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Mon Dec 1 11:14:33 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Dec 1 11:13:55 CET 2008 - mls(a)suse.de + +- susetags: fix file dependency parsing [bnc#450286] + +------------------------------------------------------------------- Fri Nov 28 18:29:08 CET 2008 - mls(a)suse.de - correct problem solving algorithm -- 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] r11837 - /branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_susetags.c
by mlschroe＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: mlschroe Date: Mon Dec 1 11:12:56 2008 New Revision: 11837 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11837&view=rev Log: - backport file provides fix [bnc#450286] - backport =Vnd support Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_susetags.c Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_susetags.c URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-so… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_susetags.c (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_susetags.c Mon Dec 1 11:12:56 2008 @@ -66,6 +66,12 @@ Id id, evrid; char *sp[4]; + if (line[6] == '/') + { + /* A file dependency. Do not try to parse it */ + id = str2id(pool, line + 6, 1); + return repo_addid_dep(pd->repo, olddeps, id, marker); + } i = split(line + 5, sp, 4); /* name, <op>, evr, ? */ if (i != 1 && i != 3) /* expect either 'name' or 'name' <op> 'evr' */ { @@ -801,6 +807,9 @@ handle = 0; indesc++; continue; + case CTAG('=', 'V', 'n', 'd'): + s->vendor = str2id(pool, line + 6, 1); + continue; /* From here it's the attribute tags. */ case CTAG('=', 'G', 'r', 'p'): -- 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] r11836 - /trunk/sat-solver/tools/repo_susetags.c
by mlschroe＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: mlschroe Date: Mon Dec 1 11:07:27 2008 New Revision: 11836 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11836&view=rev Log: - fix file dependency parsing Modified: trunk/sat-solver/tools/repo_susetags.c Modified: trunk/sat-solver/tools/repo_susetags.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_susetags.c… ============================================================================== --- trunk/sat-solver/tools/repo_susetags.c (original) +++ trunk/sat-solver/tools/repo_susetags.c Mon Dec 1 11:07:27 2008 @@ -66,15 +66,14 @@ Id id, evrid; char *sp[4]; - if (*line=='/') + if (line[6] == '/') { - /* Allow spaces in file dependencies. Autobuild may generate - such filedeps into the provides list. */ - id = str2id(pool, line, 1); + /* A file dependency. Do not try to parse it */ + id = str2id(pool, line + 6, 1); } else { - i = split(line + 5, sp, 4); /* name, <op>, evr, ? */ + i = split(line + 6, sp, 4); /* name, <op>, evr, ? */ if (i != 1 && i != 3) /* expect either 'name' or 'name' <op> 'evr' */ { pool_debug(pool, SAT_FATAL, "susetags: bad dependency line: %d: %s\n", pd->lineno, line); @@ -549,7 +548,7 @@ continue; if (! (line[0] && line[1] && line[2] && line[3] && (line[4] == ':' || line[4] == '.'))) continue; - if ( line[4] == '.') + if (line[4] == '.') { char *endlang; endlang = strchr(line + 5, ':'); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0