July 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r6324 - /trunk/zypper/package/zypper.changes
by schubi2＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: schubi2 Date: Tue Jul 31 11:16:33 2007 New Revision: 6324 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6324&view=rev Log: Removed keepExtra parameter in resolvePool; Bug 294727 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 Tue Jul 31 11:16:33 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jul 31 11:15:46 CEST 2007 - schubi(a)suse.de + +- Removed keepExtra parameter in resolvePool; Bug 294727 +- r6232 + +------------------------------------------------------------------- Tue Jul 31 11:04:35 CEST 2007 - jkupec(a)suse.cz - --debug-solver added for generating solver test case -- 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] r6323 - in /trunk/zypper/src: zypper-misc.cc zypper-misc.h zypper.cc
by schubi2＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: schubi2 Date: Tue Jul 31 11:15:15 2007 New Revision: 6323 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6323&view=rev Log: Removed keepExtra parameter in resolvePool; Bug 294727 Modified: trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-misc.h trunk/zypper/src/zypper.cc Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=63… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Tue Jul 31 11:15:15 2007 @@ -542,13 +542,10 @@ dump_pool (); } -bool resolve( bool have_extra_deps ) +bool resolve() { establish (); cout_v << _("Resolving dependencies...") << endl; - if (have_extra_deps) - return God->resolver()->resolvePool( true, true ); - return God->resolver()->resolvePool(); } @@ -1068,9 +1065,9 @@ * ZYPPER_EXIT_INF_REBOOT_NEEDED - if one of patches to be installed needs machine reboot, * ZYPPER_EXIT_INF_RESTART_NEEDED - if one of patches to be installed needs package manager restart */ -int solve_and_commit (bool have_extra_deps ) { +int solve_and_commit () { while (true) { - bool success = resolve( have_extra_deps ); + bool success = resolve(); if (success) break; Modified: trunk/zypper/src/zypper-misc.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.h?rev=632… ============================================================================== --- trunk/zypper/src/zypper-misc.h (original) +++ trunk/zypper/src/zypper-misc.h Tue Jul 31 11:15:15 2007 @@ -58,7 +58,7 @@ void load_repo_resolvables(); void establish (); -bool resolve( bool have_extra_deps = false ); +bool resolve(); void dump_pool (); void show_patches(); void xml_list_patches(); @@ -89,7 +89,7 @@ * or ZYPPER_EXIT_OK or ZYPPER_EXIT_ERR_ZYPP on zypp erorr. * */ -int solve_and_commit (bool have_extra_deps = false); +int solve_and_commit (); /** * Loops through resolvables, checking if there is license to confirm. When Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=6323&r1… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Tue Jul 31 11:15:15 2007 @@ -1003,7 +1003,7 @@ } } else - return solve_and_commit (!just_name); + return solve_and_commit (); return ZYPPER_EXIT_OK; } @@ -1225,7 +1225,7 @@ // returns ZYPPER_EXIT_OK, ZYPPER_EXIT_ERR_ZYPP, // ZYPPER_EXIT_INF_REBOOT_NEEDED, or ZYPPER_EXIT_INF_RESTART_NEEDED else - return solve_and_commit(best_effort); + return solve_and_commit(); return ZYPPER_EXIT_OK; } -- 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] r6322 - in /trunk/libzypp-bindings/swig: ruby/ruby.i zypp.i
by aschnell＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: aschnell Date: Tue Jul 31 11:11:59 2007 New Revision: 6322 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6322&view=rev Log: - use each define Modified: trunk/libzypp-bindings/swig/ruby/ruby.i trunk/libzypp-bindings/swig/zypp.i Modified: trunk/libzypp-bindings/swig/ruby/ruby.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ruby/ruby.… ============================================================================== --- trunk/libzypp-bindings/swig/ruby/ruby.i (original) +++ trunk/libzypp-bindings/swig/ruby/ruby.i Tue Jul 31 11:11:59 2007 @@ -30,7 +30,7 @@ %mixin cls "Enumerable"; \ %extend cls { \ void each() { \ - cls::iterator i = self->begin(); \ + cls::const_iterator i = self->begin(); \ while ( i != self->end() ) { \ const storetype tmp = &**i; \ rb_yield( SWIG_NewPointerObj( (void*) tmp, $descriptor(storetype), 0)); \ @@ -46,7 +46,7 @@ %mixin cls "Enumerable"; \ %extend cls { \ void each() { \ - cls::iterator i = self->begin(); \ + cls::const_iterator i = self->begin(); \ while ( i != self->end() ) { \ const storetype tmp = &*i; \ rb_yield( SWIG_NewPointerObj( (void*) tmp, $descriptor(storetype), 0)); \ @@ -93,16 +93,16 @@ } } -%extend ResPool { - void each() - { - ResPool::const_iterator i = self->begin(); - while ( i != self->end() ) { - rb_yield( SWIG_NewPointerObj( (void *) &*i, SWIGTYPE_p_PoolItem_Ref, 0)); - ++i; - } - } -} +// %extend ResPool { +// void each() +// { +// ResPool::const_iterator i = self->begin(); +// while ( i != self->end() ) { +// rb_yield( SWIG_NewPointerObj( (void *) &*i, SWIGTYPE_p_PoolItem_Ref, 0)); +// ++i; +// } +// } +// } %extend ResPool { void each_by_kind( const ResObject::Kind & kind_r ) Modified: trunk/libzypp-bindings/swig/zypp.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/zypp.i?rev… ============================================================================== --- trunk/libzypp-bindings/swig/zypp.i (original) +++ trunk/libzypp-bindings/swig/zypp.i Tue Jul 31 11:11:59 2007 @@ -118,6 +118,7 @@ /* define iterators using swig macros */ iter2( ResStore, ResObject* ) iter3( CapSet, Capability* ) +iter3(ResPool, PoolItem_Ref*) auto_iterator( std::list<RepoInfo>, RepoInfo ) #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] r6321 - /trunk/libzypp/zypp/PoolItem.h
by aschnell＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: aschnell Date: Tue Jul 31 11:09:54 2007 New Revision: 6321 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6321&view=rev Log: - fixed typos Modified: trunk/libzypp/zypp/PoolItem.h Modified: trunk/libzypp/zypp/PoolItem.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolItem.h?rev=6321… ============================================================================== --- trunk/libzypp/zypp/PoolItem.h (original) +++ trunk/libzypp/zypp/PoolItem.h Tue Jul 31 11:09:54 2007 @@ -27,14 +27,14 @@ // // CLASS NAME : PoolItem_Ref // - /** Reference to a PoolItem conecting ResObject and ResStatus. + /** Reference to a PoolItem connecting ResObject and ResStatus. * * The "real" PoolItem is usg. somewhere in the ResPool. This is * a reference to it. All copies made will reference (and modify) * the same PoolItem. All changes via a PoolItem_Ref are immediately * visible in all copies (now COW). * - * \note Constnes: Like pointer types, a <tt>const PoolItem_Ref</tt> + * \note Constness: Like pointer types, a <tt>const PoolItem_Ref</tt> * does \b not refer to a <tt>const PoolItem</tt>. The reference is * \c const, i.e. you can't change the refered PoolItem. The PoolItem * (i.e. the status) is always mutable. -- 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] r6320 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: jkupec Date: Tue Jul 31 11:05:21 2007 New Revision: 6320 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6320&view=rev Log: .chanages 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 Tue Jul 31 11:05:21 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jul 31 11:04:35 CEST 2007 - jkupec(a)suse.cz + +- --debug-solver added for generating solver test case +- r6319 + +------------------------------------------------------------------- Mon Jul 30 18:48:25 CEST 2007 - jkupec(a)suse.czi - new translations added -- 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] r6319 - in /trunk/zypper: doc/zypper.8 src/zypper-misc.cc src/zypper.cc
by jkupec＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: jkupec Date: Tue Jul 31 11:04:29 2007 New Revision: 6319 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6319&view=rev Log: --debug-solver added for generating solver test case Modified: trunk/zypper/doc/zypper.8 trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper.cc Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=6319&r1=… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Tue Jul 31 11:04:29 2007 @@ -69,6 +69,12 @@ .TP .I \-l, \-\-auto\-agree\-with\-licenses Automatically say 'yes' to third party license confirmation prompt. By using this option, you choose to agree with licenses of all third-party software this command will install. This option is particularly useful for administators installing the same set of packages on multiple machines (by an automated process) and have the licenses confirmed before. +.TP +.I \-\-debug\-solver +Create solver test case for debugging. Use this option, if you think the +dependencies were not solved all right and attach the resulting /var/log/zypper.solverTestCase +directory to your bug report. To use this option, simply add it to the problematic +install or remove command. .TP .B list-updates (lu) [options] @@ -86,14 +92,17 @@ .TP .B remove (rm) <capability> ... Remove resolvables. +.PP +Capability is usually a plain name, for details see the install command. .TP \fI\-t, -\-type\fR <resolvable_type> Type of resolvable (default: package) .TP .I \-n, \-\-name Select resolvables by older method, considering just names, not capabilities. - -Capability is usually a plain name, for details see the install command. +.TP +.I \-\-debug\-solver +Create solver test case for debugging. See the install command for details. .TP .B update (up) [options] Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=63… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Tue Jul 31 11:04:29 2007 @@ -537,7 +537,7 @@ void establish () { - cerr_v << _("Establishing status of aggregates") << endl; + cout_v << _("Establishing status of aggregates") << endl; God->resolver()->establishPool(); dump_pool (); } @@ -545,7 +545,7 @@ bool resolve( bool have_extra_deps ) { establish (); - cerr_v << _("Resolving dependencies...") << endl; + cout_v << _("Resolving dependencies...") << endl; if (have_extra_deps) return God->resolver()->resolvePool( true, true ); Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=6319&r1… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Tue Jul 31 11:04:29 2007 @@ -270,14 +270,16 @@ {"auto-agree-with-licenses", no_argument, 0, 'l'}, // rug compatibility, we have --auto-agree-with-licenses {"agree-to-third-party-licenses", no_argument, 0, 0}, + {"debug-solver", no_argument, 0, 0}, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} }; specific_options = install_options; specific_help = _( - "install [options] <name> ...\n" + "install [options] <capability> ...\n" "\n" - "'install' - Install resolvabe(s) with specified name(s).\n" + "'install' - Install resolvables with specified capabilities. A capability is\n" + " NAME[ OP <VERSION>], where OP is one of <, <=, =, >=, >.\n" "\n" " Command options:\n" "\t--catalog,-c\t\t\tOnly from this catalog (under development)\n" @@ -285,25 +287,30 @@ "\t--name,-n\t\t\tSelect resolvables by plain name, not by capability\n" "\t--auto-agree-with-licenses,-l\tAutomatically say 'yes' to third party license confirmation prompt.\n" "\t\t\t\t\tSee man zypper for more details.\n" + "\t--debug-solver\t\t\tCreate solver test case for debugging\n" ); } else if (command == ZypperCommand::REMOVE) { static struct option remove_options[] = { {"type", required_argument, 0, 't'}, {"name", no_argument, 0, 'n'}, + // rug compatibility, we have global --non-interactive {"no-confirm", no_argument, 0, 'y'}, + {"debug-solver", no_argument, 0, 0}, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} }; specific_options = remove_options; specific_help = _( - "remove [options] <name> ...\n" + "remove [options] <capability> ...\n" "\n" - "'remove' - Remove resolvabe(s) with specified name(s).\n" + "'remove' - Remove resolvables with specified capabilities. A capability is\n" + " NAME[ OP <VERSION>], where OP is one of <, <=, =, >=, >.\n" "\n" " Command options:\n" "\t--type,-t <resolvable_type>\tType of resolvable (package, patch, pattern, product) (default: package)\n" "\t--name,-n\t\t\tSelect resolvables by plain name, not by capability\n" + "\t--debug-solver\t\t\tCreate solver test case for debugging\n" ); } else if (command == ZypperCommand::ADD_REPO) { @@ -435,8 +442,9 @@ {"type", required_argument, 0, 't'}, {"skip-interactive", no_argument, 0, 0}, {"auto-agree-with-licenses", no_argument, 0, 'l'}, - { "from-repo", required_argument, 0, 0 }, - { "best-effort", no_argument, 0, 0 }, + {"from-repo", required_argument, 0, 0}, + {"best-effort", no_argument, 0, 0}, + {"debug-solver", no_argument, 0, 0}, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} }; @@ -452,7 +460,8 @@ "\t\t\t\t\tSee man zypper for more details.\n" "\t--from-repo <repository_alias>\tRestrict updates to named repository (default: get updates from all repositories)\n" "\t--best-effort\t\t\tDo a 'best effort' approach to update, updates to a lower than latest-and-greatest version are also acceptable\n" - ); + "\t--debug-solver\t\t\tCreate solver test case for debugging\n" + ); } else if (command == ZypperCommand::SEARCH) { static struct option search_options[] = { @@ -980,8 +989,22 @@ else mark_by_capability (install_not_remove, kind, *it); } - - solve_and_commit (!just_name); + + if (copts.count("debug-solver")) + { + establish(); + cout_n << _("Generating solver test case...") << endl; + if (God->resolver()->createSolverTestcase("/var/log/zypper.solverTestCase")) + cout_n << _("Solver test case generated successfully.") << endl; + else + { + cerr << _("Error creating the solver test case.") << endl; + return ZYPPER_EXIT_ERR_ZYPP; + } + } + else + return solve_and_commit (!just_name); + return ZYPPER_EXIT_OK; } @@ -1189,10 +1212,22 @@ bool skip_interactive = copts.count("skip-interactive") || gSettings.non_interactive; mark_updates( kind, srepo, skip_interactive, best_effort ); + + if (copts.count("debug-solver")) + { + cout_n << _("Generating solver test case...") << endl; + if (God->resolver()->createSolverTestcase("/var/log/zypper.solverTestCase")) + cout_n << _("Solver test case generated successfully.") << endl; + else + cerr << _("Error creating the solver test case.") << endl; + } // commit // returns ZYPPER_EXIT_OK, ZYPPER_EXIT_ERR_ZYPP, // ZYPPER_EXIT_INF_REBOOT_NEEDED, or ZYPPER_EXIT_INF_RESTART_NEEDED - return solve_and_commit(best_effort); + else + return solve_and_commit(best_effort); + + return ZYPPER_EXIT_OK; } // -----------------------------( info )------------------------------------ -- 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] r6318 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes
by schubi2＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: schubi2 Date: Tue Jul 31 10:42:19 2007 New Revision: 6318 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6318&view=rev Log: version 3.13.2 Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=6318&r… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Tue Jul 31 10:42:19 2007 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "3") SET(LIBZYPP_MINOR "13") SET(LIBZYPP_COMPATMINOR "13") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_PATCH "2") 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 Jul 31 10:42:19 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue Jul 31 10:37:13 CEST 2007 - schubi(a)suse.de + +- Removed keepExtras from resolvePool. This will be handled + in the solver internally now. #294727 +- Checking if item really exists (#295544; ResolverInfoContainer.cc) +- revision 6317 +- version 3.13.2 + +------------------------------------------------------------------- Mon Jul 30 17:23:19 CEST 2007 - ma(a)suse.de - Remove tribool from RepoInfo's interface. -- 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] r6317 - in /trunk/libzypp/zypp: Resolver.cc Resolver.h solver/detail/Resolver.cc solver/detail/Resolver.h
by schubi2＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: schubi2 Date: Tue Jul 31 10:37:02 2007 New Revision: 6317 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6317&view=rev Log: Removed keepExtras from resolvePool Modified: trunk/libzypp/zypp/Resolver.cc trunk/libzypp/zypp/Resolver.h trunk/libzypp/zypp/solver/detail/Resolver.cc trunk/libzypp/zypp/solver/detail/Resolver.h Modified: trunk/libzypp/zypp/Resolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Resolver.cc?rev=631… ============================================================================== --- trunk/libzypp/zypp/Resolver.cc (original) +++ trunk/libzypp/zypp/Resolver.cc Tue Jul 31 10:37:02 2007 @@ -66,8 +66,8 @@ { return _pimpl->freshenPool(); } bool Resolver::resolvePool () { return _pimpl->resolvePool( false ); }// do not try all possibilities - bool Resolver::resolvePool( bool tryAllPossibilities, bool keepExtras ) - { return _pimpl->resolvePool( tryAllPossibilities, keepExtras ); } + bool Resolver::resolvePool( bool tryAllPossibilities) + { return _pimpl->resolvePool( tryAllPossibilities); } bool Resolver::resolveDependencies( void ) { return _pimpl->resolveDependencies( ); } void Resolver::undo() Modified: trunk/libzypp/zypp/Resolver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Resolver.h?rev=6317… ============================================================================== --- trunk/libzypp/zypp/Resolver.h (original) +++ trunk/libzypp/zypp/Resolver.h Tue Jul 31 10:37:02 2007 @@ -127,7 +127,7 @@ * the latter case, use problems() and later applySolutions() * below. **/ - bool resolvePool (bool tryAllPossibilities, bool keepExtras = false ); + bool resolvePool (bool tryAllPossibilities); bool resolveDependencies( void ); Modified: trunk/libzypp/zypp/solver/detail/Resolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/Resolver.cc Tue Jul 31 10:37:02 2007 @@ -668,8 +668,7 @@ // process the queue resolveDependencies( context ); - - reset(); + reset( false, true ); //resetValidResults,keepExtras } context->setEstablishing (false); @@ -797,7 +796,7 @@ resolveDependencies( context ); if (resetAfterSolve) { - reset(); + reset( false, true ); //resetValidResults,keepExtras context->setEstablishing( false ); _best_context = context; } @@ -1216,14 +1215,13 @@ bool -Resolver::resolvePool( bool tryAllPossibilities, bool keepExtras ) +Resolver::resolvePool( bool tryAllPossibilities ) { ResolverContext_Ptr saveContext = _best_context; CollectTransact info (*this); // cleanup before next run - reset( false, keepExtras ); - + reset( false, true ); //resetValidResults,keepExtras bool saveTryAllPossibilities = _tryAllPossibilities; if (tryAllPossibilities) { Modified: trunk/libzypp/zypp/solver/detail/Resolver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver.h (original) +++ trunk/libzypp/zypp/solver/detail/Resolver.h Tue Jul 31 10:37:02 2007 @@ -247,7 +247,7 @@ void freshenState( ResolverContext_Ptr context = NULL, bool resetAfterSolve = true ); bool freshenPool( bool resetAfterSolve = true ); bool resolveDependencies (const ResolverContext_Ptr context = NULL); - bool resolvePool( bool tryAllPossibilities = false, bool keepExtras = false ); + bool resolvePool( bool tryAllPossibilities = false); bool transactResObject( ResObject::constPtr robj, bool install = true, -- 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] r6316 - /trunk/libzypp/zypp/solver/detail/ResolverInfoContainer.cc
by schubi2＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: schubi2 Date: Tue Jul 31 10:34:52 2007 New Revision: 6316 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6316&view=rev Log: logging not needed Modified: trunk/libzypp/zypp/solver/detail/ResolverInfoContainer.cc Modified: trunk/libzypp/zypp/solver/detail/ResolverInfoContainer.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/ResolverInfoContainer.cc (original) +++ trunk/libzypp/zypp/solver/detail/ResolverInfoContainer.cc Tue Jul 31 10:34:52 2007 @@ -23,7 +23,6 @@ #include <sstream> #include "zypp/solver/detail/ResolverInfoContainer.h" -#include "zypp/base/Logger.h" #include "zypp/solver/detail/Helper.h" ///////////////////////////////////////////////////////////////////////// @@ -172,7 +171,6 @@ // Search item_list for any mention of the item. for (PoolItemList::const_iterator iter = _item_list.begin(); iter != _item_list.end(); iter++) { - MIL << "yyyyyyxx " << item << " xx " << *iter << endl; if ((*iter)->name() == item->name()) { return true; } -- 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] r6315 - /trunk/libzypp/zypp/solver/detail/ResolverInfoContainer.cc
by schubi2＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: schubi2 Date: Tue Jul 31 10:32:10 2007 New Revision: 6315 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6315&view=rev Log: checking if item really exists; #295544 Modified: trunk/libzypp/zypp/solver/detail/ResolverInfoContainer.cc Modified: trunk/libzypp/zypp/solver/detail/ResolverInfoContainer.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/ResolverInfoContainer.cc (original) +++ trunk/libzypp/zypp/solver/detail/ResolverInfoContainer.cc Tue Jul 31 10:32:10 2007 @@ -23,6 +23,7 @@ #include <sstream> #include "zypp/solver/detail/ResolverInfoContainer.h" +#include "zypp/base/Logger.h" #include "zypp/solver/detail/Helper.h" ///////////////////////////////////////////////////////////////////////// @@ -171,6 +172,7 @@ // Search item_list for any mention of the item. for (PoolItemList::const_iterator iter = _item_list.begin(); iter != _item_list.end(); iter++) { + MIL << "yyyyyyxx " << item << " xx " << *iter << endl; if ((*iter)->name() == item->name()) { return true; } @@ -183,7 +185,7 @@ void ResolverInfoContainer::addRelatedPoolItem (PoolItem_Ref item) { - if (!mentions(item)) { + if (item && !mentions(item)) { _item_list.push_front (item); } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0