November 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r7991 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes
by schubi2＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: schubi2 Date: Fri Nov 30 14:24:51 2007 New Revision: 7991 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7991&view=rev Log: 4.1.4 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=7991&r… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Fri Nov 30 14:24:51 2007 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "4") SET(LIBZYPP_MINOR "1") SET(LIBZYPP_COMPATMINOR "1") -SET(LIBZYPP_PATCH "3") +SET(LIBZYPP_PATCH "4") 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 Fri Nov 30 14:24:51 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Nov 30 14:20:34 CET 2007 - schubi(a)suse.de + +- Enable SAT solver via environment variable ZYPP_SAT_SOLVER. + e.g.: ZYPP_SAT_SOLVER=1 zypper install foo +- version 4.1.4 +- revision 7990 + +------------------------------------------------------------------- Wed Nov 28 15:12:33 CET 2007 - aschnell(a)suse.de - make IniParser more strict (bug #306697) -- 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] r7990 - /trunk/libzypp/zypp/sat/SATResolver.cc
by schubi2＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: schubi2 Date: Fri Nov 30 13:52:43 2007 New Revision: 7990 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7990&view=rev Log: bugfix for taking solutions Modified: trunk/libzypp/zypp/sat/SATResolver.cc Modified: trunk/libzypp/zypp/sat/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SATResolver.cc?… ============================================================================== --- trunk/libzypp/zypp/sat/SATResolver.cc (original) +++ trunk/libzypp/zypp/sat/SATResolver.cc Fri Nov 30 13:52:43 2007 @@ -363,7 +363,16 @@ MIL << "SATResolver::resolvePool()" << endl; - queue_init( &jobQueue ); + if (solv) { + // remove old stuff + solver_free(solv); + solv = NULL; + queue_free( &(jobQueue) ); + } + + queue_init( &jobQueue ); + _items_to_install.clear(); + _items_to_remove.clear(); invokeOnEach ( _pool.begin(), _pool.end(), resfilter::ByTransact( ), // collect transacts from Pool to resolver queue @@ -392,7 +401,7 @@ for (PoolItemList::const_iterator iter = _items_to_remove.begin(); iter != _items_to_remove.end(); iter++) { Id id = iter->satSolvable().id(); MIL << "Delete " << *iter << " with the SAT-Pool ID: " << id << endl; - queue_push( &(jobQueue), SOLVER_ERASE_SOLVABLE_NAME ); + queue_push( &(jobQueue), SOLVER_ERASE_SOLVABLE ); queue_push( &(jobQueue), 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] r7989 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: jkupec Date: Fri Nov 30 13:08:16 2007 New Revision: 7989 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7989&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 Fri Nov 30 13:08:16 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 30 13:06:31 CET 2007 - jkupec(a)suse.cz + +- fixed some unsufficient permission exceptions for non-root + (#344938) +- r7988 + +------------------------------------------------------------------- Tue Nov 27 17:33:08 CET 2007 - jkupec(a)suse.cz - fixed help invocation (#337406) -- 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] r7988 - in /trunk/zypper/src: zypper-misc.cc zypper-repos.cc zypper.cc zypper.h
by jkupec＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: jkupec Date: Fri Nov 30 13:06:19 2007 New Revision: 7988 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7988&view=rev Log: - catch target initialization exceptions - catch exceptions from the search command - ExitRequestException added Modified: trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-repos.cc trunk/zypper/src/zypper.cc trunk/zypper/src/zypper.h Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=79… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Fri Nov 30 13:06:19 2007 @@ -44,7 +44,24 @@ //! \todo do this so that it works in zypper shell if (!done) { cout_v << _("Initializing Target") << endl; - God->initializeTarget(zypper.globalOpts().root_dir); + + try + { + God->initializeTarget(zypper.globalOpts().root_dir); + } + catch (const Exception & e) + { + report_problem(e, + _("Target initialization failed:"), + geteuid() != 0 ? + _("Running 'zypper refresh' as root might resolve the problem."):"" + ); + + zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP); + throw ExitRequestException( + "Target initialization failed: " + e.msg()); + } + done = true; } } Modified: trunk/zypper/src/zypper-repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.cc?rev=7… ============================================================================== --- trunk/zypper/src/zypper-repos.cc (original) +++ trunk/zypper/src/zypper-repos.cc Fri Nov 30 13:06:19 2007 @@ -204,8 +204,14 @@ // --------------------------------------------------------------------------- +/** + * Fill gData.repositories with active repos (enabled or specified) and refresh + * if autorefresh is on. + */ static void do_init_repos(Zypper & zypper) { + MIL << "Going to initialize repositories." << endl; + // load gpg keys cond_init_target(zypper); RepoManager manager(zypper.globalOpts().rm_options); @@ -291,6 +297,48 @@ } } } + // even if refresh is not required, try to build the sqlite cache + // for the case of non-existing cache + else if (repo.enabled()) + { + // handle root user differently + if (geteuid() == 0) + { + if (build_cache(zypper, repo, false)) + { + cerr << format(_("Disabling repository '%s' because of the above error.")) + % repo.name() << endl; + ERR << format("Disabling repository '%s' because of the above error.") + % repo.name() << endl; + + it->setEnabled(false); + } + } + // non-root user + else + { + // if error is returned, it means zypp attempted to build the sqlite + // cache for the repo and failed because writing is not allowed for + // non-root Thus, just display refresh hint for non-root user. + if (build_cache(zypper, repo, false)) + { + cout << format(_( + "The cache database needs to be built for the '%s' repository." + " You can run 'zypper refresh' as root to do this.")) % repo.name() + << endl; + + string nonroot = + "We're running as non-root, skipping building of " + repo.name() + "cache"; + MIL << nonroot << endl; + cout_vv << nonroot << endl; + + cerr << format(_("Disabling repository '%s'.")) + % repo.name() << endl << endl; + ERR << "Disabling repository '" << repo.name() << "'" << endl; + it->setEnabled(false); + } + } + } } } Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=7988&r1… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Fri Nov 30 13:06:19 2007 @@ -473,7 +473,12 @@ //cerr << _("User requested to abort.") << endl; cerr << ex.asUserString() << endl; } - catch (const Exception & ex) { + catch (const ExitRequestException & e) + { + cout_vv << "Caught exit request:" << endl << e.msg() << endl; + } + catch (const Exception & ex) + { ZYPP_CAUGHT(ex); cerr << _("Unexpected exception.") << endl; @@ -1617,23 +1622,33 @@ Table t; t.style(Ascii); - ZyppSearch search( God, options, _arguments ); - FillTable callback( t, search.installedCache(), search.getQueryInstancePtr(), search.options() ); - - search.doSearch( callback, callback ); - - if (t.empty()) - cout << _("No resolvables found.") << endl; - else { - cout << endl; - if (copts.count("sort-by-catalog") || copts.count("sort-by-repo")) - t.sort(1); - else - t.sort(3); // sort by name - cout << t; + try + { + ZyppSearch search( God, options, _arguments ); + FillTable callback( t, search.installedCache(), search.getQueryInstancePtr(), search.options() ); + + search.doSearch( callback, callback ); + + if (t.empty()) + cout << _("No resolvables found.") << endl; + else { + cout << endl; + if (copts.count("sort-by-catalog") || copts.count("sort-by-repo")) + t.sort(1); + else + t.sort(3); // sort by name + cout << t; + } + } + catch (const Exception & e) + { + report_problem(e, + _("Problem occurred initializing or executing the search query") + string(":"), + string(_("See the above message for a hint.")) + " " + + _("Running 'zypper refresh' as root might resolve the problem.")); + setExitCode(ZYPPER_EXIT_ERR_ZYPP); } - setExitCode(ZYPPER_EXIT_OK); return; } Modified: trunk/zypper/src/zypper.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.h?rev=7988&r1=… ============================================================================== --- trunk/zypper/src/zypper.h (original) +++ trunk/zypper/src/zypper.h Fri Nov 30 13:06:19 2007 @@ -157,6 +157,17 @@ extern RuntimeData gData; extern std::ostream no_stream; +class ExitRequestException +{ +public: + ExitRequestException(const std::string & msg = "") : _msg(msg) {} + ~ExitRequestException() {} + + const std::string & msg() const { return _msg; } +private: + std::string _msg; +}; + #endif /*ZYPPER_H*/ // Local Variables: -- 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] r7987 - in /trunk/libzypp/zypp: sat/SATResolver.cc solver/detail/ProblemSolutionCombi.cc solver/detail/ProblemSolutionCombi.h
by schubi2＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: schubi2 Date: Fri Nov 30 12:34:15 2007 New Revision: 7987 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7987&view=rev Log: improved output of the SAT solver Modified: trunk/libzypp/zypp/sat/SATResolver.cc trunk/libzypp/zypp/solver/detail/ProblemSolutionCombi.cc trunk/libzypp/zypp/solver/detail/ProblemSolutionCombi.h Modified: trunk/libzypp/zypp/sat/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SATResolver.cc?… ============================================================================== --- trunk/libzypp/zypp/sat/SATResolver.cc (original) +++ trunk/libzypp/zypp/sat/SATResolver.cc Fri Nov 30 12:34:15 2007 @@ -477,40 +477,40 @@ { case SOLVER_PROBLEM_UPDATE_RULE: s = pool_id2solvable(pool, source); - ret = str::form ("problem with installed package %s\n", solvable2str(pool, s)); + ret = str::form (_("problem with installed package %s"), solvable2str(pool, s)); break; case SOLVER_PROBLEM_JOB_RULE: - ret = str::form ("conflicting requests\n"); + ret = str::form (_("conflicting requests")); break; case SOLVER_PROBLEM_JOB_NOTHING_PROVIDES_DEP: - ret = str::form ("nothing provides requested %s\n", dep2str(pool, dep)); + ret = str::form (_("nothing provides requested %s"), dep2str(pool, dep)); break; case SOLVER_PROBLEM_NOT_INSTALLABLE: s = pool_id2solvable(pool, source); - ret = str::form ("package %s is not installable\n", solvable2str(pool, s)); + ret = str::form (_("package %s is not installable"), solvable2str(pool, s)); break; case SOLVER_PROBLEM_NOTHING_PROVIDES_DEP: s = pool_id2solvable(pool, source); - ret = str::form ("nothing provides %s needed by %s\n", dep2str(pool, dep), solvable2str(pool, s)); + ret = str::form (_("nothing provides %s needed by %s"), dep2str(pool, dep), solvable2str(pool, s)); break; case SOLVER_PROBLEM_SAME_NAME: s = pool_id2solvable(pool, source); s2 = pool_id2solvable(pool, target); - ret = str::form ("cannot install both %s and %s\n", solvable2str(pool, s), solvable2str(pool, s2)); + ret = str::form (_("cannot install both %s and %s"), solvable2str(pool, s), solvable2str(pool, s2)); break; case SOLVER_PROBLEM_PACKAGE_CONFLICT: s = pool_id2solvable(pool, source); s2 = pool_id2solvable(pool, target); - ret = str::form ("package %s conflicts with %s provided by %s\n", solvable2str(pool, s), dep2str(pool, dep), solvable2str(pool, s2)); + ret = str::form (_("package %s conflicts with %s provided by %s"), solvable2str(pool, s), dep2str(pool, dep), solvable2str(pool, s2)); break; case SOLVER_PROBLEM_PACKAGE_OBSOLETES: s = pool_id2solvable(pool, source); s2 = pool_id2solvable(pool, target); - ret = str::form ("package %s obsoletes %s provided by %s\n", solvable2str(pool, s), dep2str(pool, dep), solvable2str(pool, s2)); + ret = str::form (_("package %s obsoletes %s provided by %s"), solvable2str(pool, s), dep2str(pool, dep), solvable2str(pool, s2)); break; case SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE: s = pool_id2solvable(pool, source); - ret = str::form ("package %s requires %s, but none of the providers can be installed\n", solvable2str(pool, s), dep2str(pool, dep)); + ret = str::form (_("package %s requires %s, but none of the providers can be installed"), solvable2str(pool, s), dep2str(pool, dep)); break; } @@ -552,12 +552,14 @@ if (poolItem) { if (what >= solv->installed->start && what < solv->installed->start + solv->installed->nsolvables) { problemSolution->addSingleAction (poolItem, REMOVE); - MIL << "- do not keep " << id2str(pool, s->name) << "-" << id2str(pool, s->evr) << "." << id2str(pool, s->arch) << - " installed" << endl; + string description = str::form (_("do not keep %s installed"), solvable2str(pool, s) ); + MIL << description << endl; + problemSolution->setDescription (description); } else { problemSolution->addSingleAction (poolItem, KEEP); - MIL << "- do not install " << id2str(pool, s->name) << "-" << id2str(pool, s->evr) << "." << id2str(pool, s->arch) << - endl; + string description = str::form (_("do not install %s"), solvable2str(pool, s)); + MIL << description << endl; + problemSolution->setDescription (description); } } else { ERR << "SOLVER_INSTALL_SOLVABLE: No item found for " << id2str(pool, s->name) << "-" @@ -571,12 +573,14 @@ if (poolItem) { if (what >= solv->installed->start && what < solv->installed->start + solv->installed->nsolvables) { problemSolution->addSingleAction (poolItem, KEEP); - MIL << "- do not deinstall " << id2str(pool, s->name) << "-" << id2str(pool, s->evr) << "." << id2str(pool, s->arch) << - endl; + string description = str::form (_("do not deinstall %s"), solvable2str(pool, s)); + MIL << description << endl; + problemSolution->setDescription (description); } else { problemSolution->addSingleAction (poolItem, INSTALL); - MIL << "- do not forbid installation of " << id2str(pool, s->name) << "-" << id2str(pool, s->evr) << "." - << id2str(pool, s->arch) << endl; + string description = str::form (_("do not forbid installation of %s"), solvable2str(pool, s)); + MIL << description << endl; + problemSolution->setDescription (description); } } else { ERR << "SOLVER_ERASE_SOLVABLE: No item found for " << id2str(pool, s->name) << "-" << id2str(pool, s->evr) << "." << @@ -628,25 +632,31 @@ if (evrcmp(pool, sd->evr, s->evr) < 0) { - MIL << "- allow downgrade of " << id2str(pool, s->name) << "-" << id2str(pool, s->evr) << "." << id2str(pool, s->arch) - << " to " << id2str(pool, sd->name) << "-" << id2str(pool, sd->evr) << "." << id2str(pool, sd->arch) << endl; + string description = str::form (_("allow downgrade of %s to %s"), solvable2str(pool, s), solvable2str(pool, sd)); + MIL << description << endl; + problemSolution->setDescription (description); gotone = 1; } if (!solv->allowarchchange && s->name == sd->name )//&& archchanges(pool, sd, s)) { - MIL << "- allow architecture change of " << id2str(pool, s->name) << "-" << id2str(pool, s->evr) << "." << id2str(pool, s->arch) - << " to " << id2str(pool, sd->name) << "-" << id2str(pool, sd->evr) << "." << id2str(pool, sd->arch) << endl; + string description = str::form (_("allow architecture change of %s to %s"), solvable2str(pool, s), solvable2str(pool, sd)); + MIL << description << endl; + problemSolution->setDescription (description); gotone = 1; } - if (!solv->allowvendorchange && s->name == sd->name && s->vendor != sd->vendor && pool_vendor2mask(pool, s->vendor) && (pool_vendor2mask(pool, s->vendor) & pool_vendor2mask(pool, sd->vendor)) == 0) + if (!solv->allowvendorchange && s->name == sd->name && s->vendor != sd->vendor && pool_vendor2mask(pool, s->vendor) + && (pool_vendor2mask(pool, s->vendor) & pool_vendor2mask(pool, sd->vendor)) == 0) { - MIL << "- allow vendor change of " << id2str(pool, s->vendor) << id2str(pool, s->name) << "-" << id2str(pool, s->evr) << "." << id2str(pool, s->arch) - << " to " << string(sd->vendor ? id2str(pool, sd->vendor) : " (no vendor) ") << id2str(pool, sd->name) << "-" << id2str(pool, sd->evr) << "." << id2str(pool, sd->arch) << endl; + string description = str::form (_("allow vendor change of [%s]%s to [%s]%s") , id2str(pool, s->vendor) , solvable2str(pool, s), + string(sd->vendor ? id2str(pool, sd->vendor) : " (no vendor) ").c_str(), solvable2str(pool, sd)); + MIL << description << endl; + problemSolution->setDescription (description); gotone = 1; } if (!gotone) { - MIL << "- allow replacement of " << id2str(pool, s->name) << "-" << id2str(pool, s->evr) << "." << id2str(pool, s->arch) - << " to " << id2str(pool, sd->name) << "-" << id2str(pool, sd->evr) << "." << id2str(pool, sd->arch) << endl; + string description = str::form (_("allow replacement of %s to %s"), solvable2str(pool, s), solvable2str(pool, sd)); + MIL << description << endl; + problemSolution->setDescription (description); } } else { ERR << id2str(pool, s->name) << "-" << id2str(pool, s->evr) << "." << id2str(pool, s->arch) @@ -656,8 +666,10 @@ else { if (itemFrom) { + string description = str::form (_("allow replacement of %s"), solvable2str(pool, s)); + MIL << description << endl; + problemSolution->setDescription (description); problemSolution->addSingleAction (itemFrom, REMOVE); - MIL << "- allow replacement of " << id2str(pool, s->name) << "-" << id2str(pool, s->evr) << "." << id2str(pool, s->arch) << endl; } } } Modified: trunk/libzypp/zypp/solver/detail/ProblemSolutionCombi.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Probl… ============================================================================== --- trunk/libzypp/zypp/solver/detail/ProblemSolutionCombi.cc (original) +++ trunk/libzypp/zypp/solver/detail/ProblemSolutionCombi.cc Fri Nov 30 12:34:15 2007 @@ -53,13 +53,19 @@ _details = ""; } -void ProblemSolutionCombi::addSingleAction( PoolItem_Ref item, const TransactionKind action) +void ProblemSolutionCombi::addSingleAction( PoolItem_Ref item, const TransactionKind action, + const std::string description) { - addAction ( new TransactionSolutionAction (item, REMOVE)); + TransactionSolutionAction *actionTransact = new TransactionSolutionAction(item, action); + addAction (actionTransact); - ostringstream details; - details << _actions; - _description += details.str(); + if (description.size() == 0) { + ostringstream details; + details << *actionTransact; + _details += details.str(); + } else { + _details += description; + } } /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/solver/detail/ProblemSolutionCombi.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Probl… ============================================================================== --- trunk/libzypp/zypp/solver/detail/ProblemSolutionCombi.h (original) +++ trunk/libzypp/zypp/solver/detail/ProblemSolutionCombi.h Fri Nov 30 12:34:15 2007 @@ -22,6 +22,7 @@ #ifndef ZYPP_SOLVER_DETAIL_PROBLEMSOLUTIONINSTALL_H #define ZYPP_SOLVER_DETAIL_PROBLEMSOLUTIONINSTALL_H +#include <string> #include "zypp/ProblemSolution.h" #include "zypp/solver/detail/Types.h" @@ -52,7 +53,11 @@ /** * Add a single action */ - void addSingleAction( PoolItem_Ref item, const TransactionKind action); + void addSingleAction( PoolItem_Ref item, const TransactionKind action, const std::string description = ""); + /** + * Set description text + */ + void setDescription( const std::string description) { _description = description; }; }; /////////////////////////////////////////////////////////////////// -- 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] r7986 - /trunk/sat-solver/src/pool.h
by coolo＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: coolo Date: Fri Nov 30 12:24:27 2007 New Revision: 7986 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7986&view=rev Log: I hope that's ok to get the bindings going Modified: trunk/sat-solver/src/pool.h Modified: trunk/sat-solver/src/pool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.h?rev=7986&r… ============================================================================== --- trunk/sat-solver/src/pool.h (original) +++ trunk/sat-solver/src/pool.h Fri Nov 30 12:24:27 2007 @@ -154,7 +154,11 @@ */ extern void pool_free(Pool *pool); -extern void pool_debug(Pool *pool, int type, const char *format, ...) __attribute__((format(printf, 3, 4))); +extern void pool_debug(Pool *pool, int type, const char *format, ...) +#ifdef __GNUC__ + __attribute__((format(printf, 3, 4))) +#endif +; /** * Solvable management -- 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] r7985 - in /trunk/libzypp/zypp/sat: SATResolver.cc SATResolver.h
by schubi2＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: schubi2 Date: Fri Nov 30 10:33:06 2007 New Revision: 7985 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7985&view=rev Log: added new interface for solution Modified: trunk/libzypp/zypp/sat/SATResolver.cc trunk/libzypp/zypp/sat/SATResolver.h Modified: trunk/libzypp/zypp/sat/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SATResolver.cc?… ============================================================================== --- trunk/libzypp/zypp/sat/SATResolver.cc (original) +++ trunk/libzypp/zypp/sat/SATResolver.cc Fri Nov 30 10:33:06 2007 @@ -463,173 +463,62 @@ //---------------------------------------------------------------------------- //---------------------------------------------------------------------------- -string -SATconflictsString(Solver *solv, Solvable *s, Id pc) -{ - Pool *pool = solv->pool; - Solvable *sc = pool->solvables + pc; - Id p, *pp, con, *conp, obs, *obsp; - string ret; - - if (s->conflicts) { - conp = s->repo->idarraydata + s->conflicts; - while ((con = *conp++) != 0) { - FOR_PROVIDES(p, pp, con) { - if (p != pc) - continue; - ret = str::form("packags %s conflicts with %s, which is provided by %s\n", solvable2str(pool, s), dep2str(pool, con), solvable2str(pool, sc)); - } - } - } - if (s->obsoletes && (!solv->installed || s->repo != solv->installed)) { - obsp = s->repo->idarraydata + s->obsoletes; - while ((obs = *obsp++) != 0) { - FOR_PROVIDES(p, pp, obs) { - if (p != pc) - continue; - ret += str::form("packags %s obsolets %s, which is provided by %s\n", solvable2str(pool, s), dep2str(pool, obs), solvable2str(pool, sc)); - } - } - } - return ret; -} - -string -SATprobleminfoString(Solver *solv, const Queue *job, Id problem) +std::string SATResolver::SATprobleminfoString(Id problem) { - Pool *pool = solv->pool; - Rule *r; - Solvable *s; - Id p, d, rn; - Id idx = solv->problems.elements[problem - 1]; string ret; - - rn = solv->learnt_pool.elements[idx]; - if (rn < 0) { - p = rn; /* fake a negative assertion rule */ - r = 0; - } else { - r = solv->rules + rn; - p = r->p; - } - - if (!r || r->w2 == 0) { - Id req, *reqp, *dp; - int count = 0; - - /* assertions */ - if (p == -SYSTEMSOLVABLE) { - Id ji, what; - - /* we tried to deinstall the system solvable. must be a job. */ - if (rn < solv->jobrules || rn >= solv->systemrules) - abort(); - ji = solv->ruletojob.elements[rn - solv->jobrules]; - what = job->elements[ji + 1]; - switch (job->elements[ji]) { - case SOLVER_INSTALL_SOLVABLE_NAME: - ret = str::form ("no solvable exists with name %s\n", dep2str(pool, what)); - break; - case SOLVER_INSTALL_SOLVABLE_PROVIDES: - ret = str::form ("no solvable provides %s\n", dep2str(pool, what)); - break; - default: - ret = str::form ("unknown job\n"); - } - return ret; - } - if (p > 0 && solv->learnt_pool.elements[idx + 1] == -p) { - /* we conflicted with a direct rpm assertion */ - /* print other rule */ - p = -p; - rn = 0; - } - if (rn >= solv->jobrules) { - ret += "some job/system/learnt rule\n"; - return ret; - } - if (p >= 0) - abort(); - /* negative assertion, i.e. package is not installable */ - s = pool->solvables + (-p); - if (s->requires) { - reqp = s->repo->idarraydata + s->requires; - while ((req = *reqp++) != 0) { - if (req == SOLVABLE_PREREQMARKER) - continue; - dp = pool_whatprovides(pool, req); - if (*dp) - continue; - ret += str::form ("package %s requires %s, but no package provides it\n", solvable2str(pool, s), dep2str(pool, req)); - count++; - } - } - if (!count) - ret += str::form ("package %s is not installable\n", solvable2str(pool, s)); - return ret; + Pool *pool = solv->pool; + Id probr; + Id dep, source, target; + Solvable *s, *s2; + + probr = solver_findproblemrule(solv, problem); + switch (solver_problemruleinfo(solv, &(jobQueue), probr, &dep, &source, &target)) + { + case SOLVER_PROBLEM_UPDATE_RULE: + s = pool_id2solvable(pool, source); + ret = str::form ("problem with installed package %s\n", solvable2str(pool, s)); + break; + case SOLVER_PROBLEM_JOB_RULE: + ret = str::form ("conflicting requests\n"); + break; + case SOLVER_PROBLEM_JOB_NOTHING_PROVIDES_DEP: + ret = str::form ("nothing provides requested %s\n", dep2str(pool, dep)); + break; + case SOLVER_PROBLEM_NOT_INSTALLABLE: + s = pool_id2solvable(pool, source); + ret = str::form ("package %s is not installable\n", solvable2str(pool, s)); + break; + case SOLVER_PROBLEM_NOTHING_PROVIDES_DEP: + s = pool_id2solvable(pool, source); + ret = str::form ("nothing provides %s needed by %s\n", dep2str(pool, dep), solvable2str(pool, s)); + break; + case SOLVER_PROBLEM_SAME_NAME: + s = pool_id2solvable(pool, source); + s2 = pool_id2solvable(pool, target); + ret = str::form ("cannot install both %s and %s\n", solvable2str(pool, s), solvable2str(pool, s2)); + break; + case SOLVER_PROBLEM_PACKAGE_CONFLICT: + s = pool_id2solvable(pool, source); + s2 = pool_id2solvable(pool, target); + ret = str::form ("package %s conflicts with %s provided by %s\n", solvable2str(pool, s), dep2str(pool, dep), solvable2str(pool, s2)); + break; + case SOLVER_PROBLEM_PACKAGE_OBSOLETES: + s = pool_id2solvable(pool, source); + s2 = pool_id2solvable(pool, target); + ret = str::form ("package %s obsoletes %s provided by %s\n", solvable2str(pool, s), dep2str(pool, dep), solvable2str(pool, s2)); + break; + case SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE: + s = pool_id2solvable(pool, source); + ret = str::form ("package %s requires %s, but none of the providers can be installed\n", solvable2str(pool, s), dep2str(pool, dep)); + break; } - if (rn >= solv->learntrules) { - /* learnt rule, ignore for now */ - ret += str::form ("some learnt rule...\n"); -// printrule(solv, r); - return ret; - } - if (rn >= solv->systemrules) { - /* system rule, ignore for now */ - ret += str::form ("some system rule...\n"); -// printrule(solv, r); - return ret; - } - if (rn >= solv->jobrules) { - /* job rule, ignore for now */ - ret += str::form ("some job rule...\n"); -// printrule(solv, r); - return ret; - } - /* only rpm rules left... */ - p = r->p; - d = r->d; - if (p >= 0) - abort(); - if (d == 0 && r->w2 < 0) { - Solvable *sp, *sd; - d = r->w2; - sp = pool->solvables + (-p); - sd = pool->solvables + (-d); - if (sp->name == sd->name) { - ret += str::form ("cannot install both %s and %s\n", solvable2str(pool, sp), solvable2str(pool, sd)); - } else { - ret += SATconflictsString (solv, pool->solvables + (-p), -d); - ret += SATconflictsString (solv, pool->solvables + (-d), -p); - } - } else { - /* find requires of p that corresponds with our rule */ - Id req, *reqp, *dp; - s = pool->solvables + (-p); - reqp = s->repo->idarraydata + s->requires; - while ((req = *reqp++) != 0) { - if (req == SOLVABLE_PREREQMARKER) - continue; - dp = pool_whatprovides(pool, req); - if (d == 0) { - if (*dp == r->w2 && dp[1] == 0) - break; - } - else if (dp - pool->whatprovidesdata == d) - break; - } - if (!req) { - ret += str::form ("req not found\n"); - } - ret += str::form ("package %s requires %s, but none of its providers can be installed\n", solvable2str(pool, s), dep2str(pool, req)); - } return ret; } ResolverProblemList -SATResolver::problems () const +SATResolver::problems () { ResolverProblemList resolverProblems; if (solv && solv->problems.count) { @@ -645,7 +534,7 @@ while ((problem = solver_next_problem(solv, problem)) != 0) { MIL << "Problem " << pcnt << ":" << endl; MIL << "====================================" << endl; - string whatString = SATprobleminfoString(solv, &jobQueue, problem); + string whatString = SATprobleminfoString(problem); ResolverProblem_Ptr resolverProblem = new ResolverProblem (whatString, ""); solution = 0; while ((solution = solver_next_solution(solv, problem, solution)) != 0) { Modified: trunk/libzypp/zypp/sat/SATResolver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SATResolver.h?r… ============================================================================== --- trunk/libzypp/zypp/sat/SATResolver.h (original) +++ trunk/libzypp/zypp/sat/SATResolver.h Fri Nov 30 10:33:06 2007 @@ -75,6 +75,9 @@ PoolItemList _items_to_remove; PoolItemList _items_to_lockUninstalled; PoolItemList _items_to_keep; + + // ---------------------------------- methods + std::string SATprobleminfoString (Id problem); public: @@ -87,9 +90,7 @@ friend std::ostream& operator<<(std::ostream& str, const SATResolver & obj) { return obj.dumpOn (str); } - // ---------------------------------- methods - void setTimeout (int seconds) { _timeout_seconds = seconds; } void setMaxSolverPasses (int count) { _maxSolverPasses = count; } int timeout () const { return _timeout_seconds; } @@ -99,7 +100,7 @@ bool resolvePool(); - ResolverProblemList problems () const; + ResolverProblemList problems (); void applySolutions (const ProblemSolutionList &solutions); Arch architecture() const { return _architecture; } -- 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] r7984 - /branches/use-solv/libzypp/zypp/pool/PoolTraits.h
by matz＠svn.opensuse.org 29 Nov '07

29 Nov '07

Author: matz Date: Fri Nov 30 00:22:48 2007 New Revision: 7984 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7984&view=rev Log: Well, okay. We can become a little faster with this micro optimization of using hash_map<>, instead of std::map<>. If we get rid of the old solver we can do away with this whole CapHash and NameHash dang, reducing the runtime by roughly 33%. Modified: branches/use-solv/libzypp/zypp/pool/PoolTraits.h Modified: branches/use-solv/libzypp/zypp/pool/PoolTraits.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/pool/Po… ============================================================================== --- branches/use-solv/libzypp/zypp/pool/PoolTraits.h (original) +++ branches/use-solv/libzypp/zypp/pool/PoolTraits.h Fri Nov 30 00:22:48 2007 @@ -14,6 +14,8 @@ #include <set> #include <map> +#include <ext/hash_fun.h> +#include <ext/hash_map> #include "zypp/PoolItem.h" #include "zypp/Capability.h" @@ -81,7 +83,7 @@ // internal organization typedef std::list<zypp::CapAndItem> CapItemContainerT; // (why,who) pairs - typedef std::map<Id,CapItemContainerT> CapItemStoreT; // capability.index -> (why,who) pairs + typedef __gnu_cxx::hash_map<Id,CapItemContainerT> CapItemStoreT; // capability.index -> (why,who) pairs typedef std::map<Dep,CapItemStoreT> DepCapItemContainerT; // Dep -> (capability.index -> (why,who) pairs) typedef CapItemContainerT::iterator capitemiterator; -- 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] r7983 - /branches/use-solv/libzypp/zypp/pool/PoolImpl.h
by matz＠svn.opensuse.org 29 Nov '07

29 Nov '07

Author: matz Date: Fri Nov 30 00:20:32 2007 New Revision: 7983 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7983&view=rev Log: Typo from upstream. Obviously this functions is never called, otherwise that would have been noticed already. Modified: branches/use-solv/libzypp/zypp/pool/PoolImpl.h Modified: branches/use-solv/libzypp/zypp/pool/PoolImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/pool/Po… ============================================================================== --- branches/use-solv/libzypp/zypp/pool/PoolImpl.h (original) +++ branches/use-solv/libzypp/zypp/pool/PoolImpl.h Fri Nov 30 00:20:32 2007 @@ -154,7 +154,7 @@ /** */ iterator end( Id tag_r, Dep cap_r ) - { return _store[cap_r][tag_r].begin(); } + { return _store[cap_r][tag_r].end(); } /** */ const_iterator end( Id tag_r, Dep cap_r ) const { const CapItemStoreT & capitemstore = capItemStore( cap_r ); -- 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] r7982 - in /branches/use-solv/libzypp/zypp: base/LogControl.cc base/Logger.h solver/detail/Types.h
by matz＠svn.opensuse.org 29 Nov '07

29 Nov '07

Author: matz Date: Fri Nov 30 00:02:11 2007 New Revision: 7982 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7982&view=rev Log: Let's not call expensive operators for logging when we're not going to actually print anything. Shoves off another 0.4 seconds, now at 1.3. Can't get much faster without getting rid of the old solver. Modified: branches/use-solv/libzypp/zypp/base/LogControl.cc branches/use-solv/libzypp/zypp/base/Logger.h branches/use-solv/libzypp/zypp/solver/detail/Types.h Modified: branches/use-solv/libzypp/zypp/base/LogControl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/base/Lo… ============================================================================== --- branches/use-solv/libzypp/zypp/base/LogControl.cc (original) +++ branches/use-solv/libzypp/zypp/base/LogControl.cc Fri Nov 30 00:02:11 2007 @@ -214,6 +214,9 @@ struct LogControlImpl { public: + bool isExcessive() + { return _excessive; } + void excessive( bool onOff_r ) { _excessive = onOff_r; } @@ -361,6 +364,9 @@ buffer_r ); } + bool isExcessive() + { return LogControlImpl::instance.isExcessive(); } + ///////////////////////////////////////////////////////////////// } // namespace logger /////////////////////////////////////////////////////////////////// Modified: branches/use-solv/libzypp/zypp/base/Logger.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/base/Lo… ============================================================================== --- branches/use-solv/libzypp/zypp/base/Logger.h (original) +++ branches/use-solv/libzypp/zypp/base/Logger.h Fri Nov 30 00:02:11 2007 @@ -109,6 +109,7 @@ const char * file_r, const char * func_r, const int line_r ); + extern bool isExcessive(); ///////////////////////////////////////////////////////////////// } // namespace logger Modified: branches/use-solv/libzypp/zypp/solver/detail/Types.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/solver/… ============================================================================== --- branches/use-solv/libzypp/zypp/solver/detail/Types.h (original) +++ branches/use-solv/libzypp/zypp/solver/detail/Types.h Fri Nov 30 00:02:11 2007 @@ -35,7 +35,7 @@ #include "zypp/PoolItem.h" #define _DEBUG(x) DBG << x << std::endl; -#define _XDEBUG(x) XXX << x << std::endl; +#define _XDEBUG(x) do { if (base::logger::isExcessive()) XXX << x << std::endl;} while (0) //#define _DEBUG(x) ///////////////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0