August 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r7061 - in /trunk/libzypp/zypp: detail/ repo/cached/ repo/memory/
by mlandres＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: mlandres Date: Fri Aug 31 16:31:22 2007 New Revision: 7061 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7061&view=rev Log: Patch Atomlist will be computed and provided by the base class. No need for Patch implementations to overload this method. Modified: trunk/libzypp/zypp/detail/PatchImpl.cc trunk/libzypp/zypp/detail/PatchImpl.h trunk/libzypp/zypp/detail/PatchImplIf.cc trunk/libzypp/zypp/detail/PatchImplIf.h trunk/libzypp/zypp/repo/cached/PatchImpl.cc trunk/libzypp/zypp/repo/cached/PatchImpl.h trunk/libzypp/zypp/repo/memory/PatchImpl.cc trunk/libzypp/zypp/repo/memory/PatchImpl.h Modified: trunk/libzypp/zypp/detail/PatchImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/detail/PatchImpl.cc… ============================================================================== --- trunk/libzypp/zypp/detail/PatchImpl.cc (original) +++ trunk/libzypp/zypp/detail/PatchImpl.cc Fri Aug 31 16:31:22 2007 @@ -72,10 +72,6 @@ return _affects_pkg_manager; } - PatchImpl::AtomList PatchImpl::all_atoms() const { - return _atoms; - } - ///////////////////////////////////////////////////////////////// } // namespace detail /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/detail/PatchImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/detail/PatchImpl.h?… ============================================================================== --- trunk/libzypp/zypp/detail/PatchImpl.h (original) +++ trunk/libzypp/zypp/detail/PatchImpl.h Fri Aug 31 16:31:22 2007 @@ -52,8 +52,6 @@ virtual bool reboot_needed() const; /** Does the patch affect the package manager itself? */ virtual bool affects_pkg_manager() const; - /** The list of all atoms building the patch */ - virtual AtomList all_atoms() const; protected: /** Patch ID */ @@ -70,8 +68,6 @@ bool _reboot_needed; /** Does the patch affect the package manager itself? */ bool _affects_pkg_manager; - /** The list of all atoms building the patch */ - AtomList _atoms; }; /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/detail/PatchImplIf.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/detail/PatchImplIf.… ============================================================================== --- trunk/libzypp/zypp/detail/PatchImplIf.cc (original) +++ trunk/libzypp/zypp/detail/PatchImplIf.cc Fri Aug 31 16:31:22 2007 @@ -60,7 +60,9 @@ } PatchImplIf::AtomList PatchImplIf::all_atoms() const - { return AtomList(); } + { + return AtomList(); + } ///////////////////////////////////////////////////////////////// } // namespace detail Modified: trunk/libzypp/zypp/detail/PatchImplIf.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/detail/PatchImplIf.… ============================================================================== --- trunk/libzypp/zypp/detail/PatchImplIf.h (original) +++ trunk/libzypp/zypp/detail/PatchImplIf.h Fri Aug 31 16:31:22 2007 @@ -51,10 +51,14 @@ virtual bool reboot_needed() const PURE_VIRTUAL; /** Does the patch affect the package manager itself? */ virtual bool affects_pkg_manager() const PURE_VIRTUAL; - - /** Is the patch installation interactive? (does it need user input?) */ + + /** Is the patch installation interactive? (does it need user input?) + * \warning Computed here, usually no need to overload this. + */ virtual bool interactive() const PURE_VIRTUAL; - /** The list of all atoms building the patch */ + /** The list of all atoms building the patch + * \warning Computed here, usually no need to overload this. + */ virtual AtomList all_atoms() const PURE_VIRTUAL; }; /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/repo/cached/PatchImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/cached/PatchIm… ============================================================================== --- trunk/libzypp/zypp/repo/cached/PatchImpl.cc (original) +++ trunk/libzypp/zypp/repo/cached/PatchImpl.cc Fri Aug 31 16:31:22 2007 @@ -105,9 +105,7 @@ std::string PatchImpl::id() const { -#warning DUBIOUS ATTRIBUTE - return ""; - //return _repository->resolvableQuery().queryStringAttribute( _id, cache::attrPatchId() ); + return _repository->resolvableQuery().queryStringAttribute( _id, cache::attrPatchId() ); } Date PatchImpl::timestamp() const @@ -130,19 +128,6 @@ return _repository->resolvableQuery().queryBooleanAttribute( _id, cache::attrPatchAffectsPkgManager() ); } -bool PatchImpl::interactive() const -{ -#warning DUBIOUS ATTRIBUTE - return false; - //return _repository->resolvableQuery().queryBooleanAttribute( _id, cache::attrPatchInteractive() ); -} - -PatchImpl::AtomList PatchImpl::all_atoms() const -{ -#warning DUBIOUS ATTRIBUTE - return PatchImpl::AtomList(); -} - ///////////////////////////////////////////////////////////////// } } } // namespace zypp::repo::cached /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/repo/cached/PatchImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/cached/PatchIm… ============================================================================== --- trunk/libzypp/zypp/repo/cached/PatchImpl.h (original) +++ trunk/libzypp/zypp/repo/cached/PatchImpl.h Fri Aug 31 16:31:22 2007 @@ -48,8 +48,6 @@ virtual std::string category() const; virtual bool reboot_needed() const; virtual bool affects_pkg_manager() const; - virtual bool interactive() const; - virtual AtomList all_atoms() const; virtual Repository repository() const; Modified: trunk/libzypp/zypp/repo/memory/PatchImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/memory/PatchIm… ============================================================================== --- trunk/libzypp/zypp/repo/memory/PatchImpl.cc (original) +++ trunk/libzypp/zypp/repo/memory/PatchImpl.cc Fri Aug 31 16:31:22 2007 @@ -129,11 +129,6 @@ return _affects_pkg_manager; } -PatchImpl::AtomList PatchImpl::all_atoms() const -{ - return _atoms; -} - ///////////////////////////////////////////////////////////////// } } } // namespace zypp::repo::memory /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/repo/memory/PatchImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/memory/PatchIm… ============================================================================== --- trunk/libzypp/zypp/repo/memory/PatchImpl.h (original) +++ trunk/libzypp/zypp/repo/memory/PatchImpl.h Fri Aug 31 16:31:22 2007 @@ -27,7 +27,7 @@ public: PatchImpl( repo::memory::RepoImpl::Ptr repo, data::Patch_Ptr ptr); - + virtual TranslatedText summary() const; virtual TranslatedText description() const; virtual TranslatedText insnotify() const; @@ -38,20 +38,19 @@ virtual bool installOnly() const; virtual Date buildtime() const; virtual Date installtime() const; - + // PATCH virtual std::string id() const; virtual Date timestamp() const; virtual std::string category() const; virtual bool reboot_needed() const; virtual bool affects_pkg_manager() const; - virtual AtomList all_atoms() const; - + virtual Repository repository() const; - + protected: repo::memory::RepoImpl::Ptr _repository; - + //ResObject TranslatedText _summary; TranslatedText _description; @@ -63,14 +62,13 @@ bool _install_only; Date _buildtime; Date _installtime; - + // patch std::string _patch_id; Date _timestamp; std::string _category; bool _reboot_needed; bool _affects_pkg_manager; - AtomList _atoms; }; ///////////////////////////////////////////////////////////////// } // namespace memory -- 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] r7060 - in /trunk/libzypp/zypp/cache: CacheAttributes.h CacheStore.cc
by mlandres＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: mlandres Date: Fri Aug 31 16:28:05 2007 New Revision: 7060 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7060&view=rev Log: Added missing PatchId attribute Modified: trunk/libzypp/zypp/cache/CacheAttributes.h trunk/libzypp/zypp/cache/CacheStore.cc Modified: trunk/libzypp/zypp/cache/CacheAttributes.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/CacheAttribut… ============================================================================== --- trunk/libzypp/zypp/cache/CacheAttributes.h (original) +++ trunk/libzypp/zypp/cache/CacheAttributes.h Fri Aug 31 16:28:05 2007 @@ -65,6 +65,7 @@ /////////////////////////////////////////////////////////////////// inline const Attribute & attrPatchAffectsPkgManager() { static Attribute a("Patch","affectsPkgManager"); return a; } inline const Attribute & attrPatchCategory() { static Attribute a("Patch","category"); return a; } + inline const Attribute & attrPatchId() { static Attribute a("Patch","id"); return a; } inline const Attribute & attrPatchRebootNeeded() { static Attribute a("Patch","rebootNeeded"); return a; } inline const Attribute & attrPatchTimestamp() { static Attribute a("Patch","timestamp"); return a; } /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/cache/CacheStore.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/CacheStore.cc… ============================================================================== --- trunk/libzypp/zypp/cache/CacheStore.cc (original) +++ trunk/libzypp/zypp/cache/CacheStore.cc Fri Aug 31 16:28:05 2007 @@ -311,6 +311,7 @@ // patch attributes appendNumericAttribute( id, attrPatchTimestamp(), patch->timestamp ); appendStringAttribute( id, attrPatchCategory(), patch->category ); + appendStringAttribute( id, attrPatchId(), patch->id ); appendBooleanAttribute( id, attrPatchRebootNeeded(), patch->rebootNeeded ); appendBooleanAttribute( id, attrPatchAffectsPkgManager(), patch->affectsPkgManager ); -- 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] r7059 - /trunk/updater-kde/package/opensuse-updater-kde.spec
by tgoettlicher＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: tgoettlicher Date: Fri Aug 31 16:06:19 2007 New Revision: 7059 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7059&view=rev Log: spec Modified: trunk/updater-kde/package/opensuse-updater-kde.spec Modified: trunk/updater-kde/package/opensuse-updater-kde.spec URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd… ============================================================================== --- trunk/updater-kde/package/opensuse-updater-kde.spec (original) +++ trunk/updater-kde/package/opensuse-updater-kde.spec Fri Aug 31 16:06:19 2007 @@ -90,6 +90,8 @@ %changelog -n opensuse-updater-kde * Thu Aug 30 2007 - tgoettlicher(a)suse.de +- improved error handling +* Thu Aug 30 2007 - tgoettlicher(a)suse.de - fixed opensuse kde steal focus (#305522) - fixed "Updating..." progress popup is disturbing (#304338) * Wed Aug 29 2007 - tgoettlicher(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] r7058 - in /trunk/libzypp-bindings: README examples/python/date.py swig/Date.i
by aschnell＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: aschnell Date: Fri Aug 31 15:48:32 2007 New Revision: 7058 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7058&view=rev Log: - use zypp date class Added: trunk/libzypp-bindings/examples/python/date.py (with props) Modified: trunk/libzypp-bindings/README trunk/libzypp-bindings/swig/Date.i Modified: trunk/libzypp-bindings/README URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/README?rev=7058… ============================================================================== --- trunk/libzypp-bindings/README (original) +++ trunk/libzypp-bindings/README Fri Aug 31 15:48:32 2007 @@ -2,27 +2,18 @@ Attempt to create generated bindings for libzypp. Not restricted to one language. -Author: dmacvicar(a)suse.de - -Notes: - -- Some classes are not wrapped but converted to - equivalents: - -Usage: - -Requires swig and ruby installed. +Authors: dmacvicar(a)suse.de + aschnell(a)suse.de Ruby Notes ========== * API tries to follow ruby standards: -* zypp::Pathname -> std Pathname in ruby -* zypp::Date -> std Time in ruby -* ResStore does not implement iterators but: +* Containers do not implement iterators but: * each - * each_by_name + * to_a * etc * lower case methods, ie: ZYppFactory::instance.get_zypp instead of ZYppFactory::instance()->getZYpp() z.initialize_target("/") for z.initializeTarget("/") + Added: trunk/libzypp-bindings/examples/python/date.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/examples/python… ============================================================================== --- trunk/libzypp-bindings/examples/python/date.py (added) +++ trunk/libzypp-bindings/examples/python/date.py Fri Aug 31 15:48:32 2007 @@ -0,0 +1,10 @@ +#!/usr/bin/python + +from zypp import Date + +print Date() + +d = Date.now() +print d +print d.form("%F %T") + Modified: trunk/libzypp-bindings/swig/Date.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/Date.i?rev… ============================================================================== --- trunk/libzypp-bindings/swig/Date.i (original) +++ trunk/libzypp-bindings/swig/Date.i Fri Aug 31 15:48:32 2007 @@ -1,17 +1,20 @@ -#ifdef SWIGRUBY +#if defined(SWIGPYTHON) || defined(SWIGRUBY) +%rename Date::asString "__str__"; +#endif -%typemap(in) Date { - Date::ValueType seconds = (Date::ValueType) NUM2INT( rb_funcall( $input, rb_intern("to_i"), 0, 0) ); - $1 = Date(seconds); -} - -%typemap(out) Date { - // Time works without require - VALUE klass = rb_const_get( rb_cObject, rb_intern("Time")); - VALUE rbtimenum = INT2NUM( (Date::ValueType) $1 ); - $result = rb_funcall( klass, rb_intern("at"), 1, rbtimenum); -} +class Date +{ +public: -#endif + Date(); + Date(const std::string & seconds_r); + + static Date now(); + + std::string form(const std::string & format_r) const; + std::string asString() const; + std::string asSeconds() const; + +}; -- 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] r7057 - /trunk/zypper/src/zypper-misc.cc
by kkaempf＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: kkaempf Date: Fri Aug 31 15:22:22 2007 New Revision: 7057 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7057&view=rev Log: revert deletion of list-all-problems, but only if multiple problems exist Modified: trunk/zypper/src/zypper-misc.cc Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=70… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Fri Aug 31 15:22:22 2007 @@ -491,6 +491,14 @@ stm << _("Specified capability not found") << endl; return false; } + // for many problems, list them shortly first + if (rproblems.size() > 1) + { + for (i = b; i != e; ++i) { + stm << _("Problem: ") << (*i)->description () << endl; + } + } + // now list all problems with solution proposals for (i = b; i != e; ++i) { stm << endl; tribool stopnow = show_problem (*(*i), todo); -- 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] r7056 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: jkupec Date: Fri Aug 31 15:19:17 2007 New Revision: 7056 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7056&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 Aug 31 15:19:17 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 31 14:35:01 CEST 2007 - jkupec(a)suse.cz + +- fixed error message of zypper ar -r (#306667) +- r7055 + +------------------------------------------------------------------- Fri Aug 31 14:07:11 CEST 2007 - kkaempf(a)suse.de - dont prompt for solutions if none are available. -- 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] r7055 - in /trunk/zypper/src: zypper-misc.cc zypper-sources.cc
by jkupec＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: jkupec Date: Fri Aug 31 14:34:19 2007 New Revision: 7055 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7055&view=rev Log: - fixed error message of zypper ar -r (#306667) Modified: trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-sources.cc Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=70… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Fri Aug 31 14:34:19 2007 @@ -13,7 +13,6 @@ #include <zypp/RepoManager.h> #include <zypp/RepoInfo.h> -#include <zypp/repo/RepoException.h> #include <zypp/CapFactory.h> Modified: trunk/zypper/src/zypper-sources.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-sources.cc?rev… ============================================================================== --- trunk/zypper/src/zypper-sources.cc (original) +++ trunk/zypper/src/zypper-sources.cc Fri Aug 31 14:34:19 2007 @@ -784,8 +784,37 @@ //! \todo handle local .repo files, validate the URL Url url(repo_file_url); RepoManager manager; - list<RepoInfo> repos = readRepoFile(url); + list<RepoInfo> repos; + // read the repo file + try { repos = readRepoFile(url); } + catch (const media::MediaException & e) + { + ZYPP_CAUGHT(e); + report_problem(e, + _("Problem accessing the file at the specified URL") + string(":"), + _("Please check if the URL is valid and accessible.")); + return ZYPPER_EXIT_ERR_ZYPP; + } + catch (const parser::ParseException & e) + { + ZYPP_CAUGHT(e); + report_problem(e, + _("Problem parsing the file at the specified URL") + string(":"), + // TranslatorExplanation don't translate the URL if the URL itself is not translated. + // Also don't translate the '.repo' string. + _("Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details.")); + return ZYPPER_EXIT_ERR_ZYPP; + } + catch (const Exception & e) + { + ZYPP_CAUGHT(e); + report_problem(e, + _("Problem encountered while trying to read the file at the specified URL") + string(":")); + return ZYPPER_EXIT_ERR_ZYPP; + } + + // add repos for (list<RepoInfo>::const_iterator it = repos.begin(); it != repos.end(); ++it) { -- 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] r7054 - in /trunk/zypper: package/zypper.changes src/zypper-misc.cc
by kkaempf＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: kkaempf Date: Fri Aug 31 14:15:47 2007 New Revision: 7054 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7054&view=rev Log: - dont prompt for solutions if none are available. - dont duplicate dependency problems in output. - indent details by 2 blanks, resolver indents further details by 4 blanks. - provide additional details for problems (#306240) - don't prompt user for every dependency (#304325) - don't clutter the log with pool lists. - r 7054 Modified: trunk/zypper/package/zypper.changes trunk/zypper/src/zypper-misc.cc 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 Aug 31 14:15:47 2007 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Fri Aug 31 14:07:11 CEST 2007 - kkaempf(a)suse.de + +- dont prompt for solutions if none are available. +- dont duplicate dependency problems in output. +- indent details by 2 blanks, resolver indents further details + by 4 blanks. +- provide additional details for problems (#306240) +- don't prompt user for every dependency (#304325) +- don't clutter the log with pool lists. +- r 7054 + +------------------------------------------------------------------- Thu Aug 30 20:32:56 CEST 2007 - jkupec(a)suse.cz - suppressing excessive output of media errors Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=70… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Fri Aug 31 14:15:47 2007 @@ -422,7 +422,7 @@ stm << _("Problem: ") << prob.description () << endl; det = prob.details (); if (!det.empty ()) - stm << " " << det << endl; + stm << " " << det << endl; int n; ProblemSolutionList solutions = prob.solutions (); @@ -443,6 +443,9 @@ int reply; do { + // without solutions, its useless to prompt + if (solutions.empty()) + return false; // input prompt cerr << _("number, (r)etry or (c)ancel> ") << flush; string reply_s = str::getline (cin, zypp::str::TRIM); @@ -482,8 +485,7 @@ e = rproblems.end (), i; ProblemSolutionList todo; - bool no_problem = b == e; - if (!no_problem) { + if (!rproblems.empty()) { stm << format (_("%s Problems:")) % rproblems.size() << endl; } else { @@ -491,9 +493,6 @@ return false; } for (i = b; i != e; ++i) { - stm << _("Problem: ") << (*i)->description () << endl; - } - for (i = b; i != e; ++i) { stm << endl; tribool stopnow = show_problem (*(*i), todo); if (! indeterminate (stopnow)) { @@ -805,6 +804,7 @@ { establish (); cout_v << _("Resolving dependencies...") << endl; + God->resolver()->setForceResolve( true ); return God->resolver()->resolvePool(); } @@ -861,7 +861,7 @@ || it->status().transacts() // or transacts || !it->status().isUndetermined()) // or established status { - _DEBUG( count << ": " << *it ); + _XDEBUG( count << ": " << *it ); } } _XDEBUG( "---------------------------------------" ); -- 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] r7053 - in /trunk/libzypp/zypp/solver/detail: ContextPool.cc Helper.cc Resolver.cc ResolverContext.cc Resolver_problems.cc
by schubi2＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: schubi2 Date: Fri Aug 31 14:08:04 2007 New Revision: 7053 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7053&view=rev Log: reduced logging Modified: trunk/libzypp/zypp/solver/detail/ContextPool.cc trunk/libzypp/zypp/solver/detail/Helper.cc trunk/libzypp/zypp/solver/detail/Resolver.cc trunk/libzypp/zypp/solver/detail/ResolverContext.cc trunk/libzypp/zypp/solver/detail/Resolver_problems.cc Modified: trunk/libzypp/zypp/solver/detail/ContextPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Conte… ============================================================================== --- trunk/libzypp/zypp/solver/detail/ContextPool.cc (original) +++ trunk/libzypp/zypp/solver/detail/ContextPool.cc Fri Aug 31 14:08:04 2007 @@ -44,7 +44,7 @@ { for (PoolItemList::const_iterator iter = list.begin(); iter != list.end(); iter++) { - DBG << " " << *iter << endl; + XXX << " " << *iter << endl; } } Modified: trunk/libzypp/zypp/solver/detail/Helper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Helpe… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Helper.cc (original) +++ trunk/libzypp/zypp/solver/detail/Helper.cc Fri Aug 31 14:08:04 2007 @@ -125,12 +125,10 @@ bool operator()( PoolItem_Ref provider ) { - MIL << "comparing: " << endl << provider << endl << uninstalled << endl; - // is valid if ( ! provider.resolvable() ) { - MIL << "Warning: '" << provider << "' not valid" << endl; + WAR << "Warning: '" << provider << "' not valid" << endl; return true; } 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 Fri Aug 31 14:08:04 2007 @@ -295,11 +295,11 @@ { for (PoolItemList::const_iterator iter = install.begin(); iter != install.end(); iter++) { - DBG << " to_install " << *iter << endl; + XXX << " to_install " << *iter << endl; } for (PoolItemList::const_iterator iter = remove.begin(); iter != remove.end(); iter++) { - DBG << " to_remove " << *iter << endl; + XXX << " to_remove " << *iter << endl; } } Modified: trunk/libzypp/zypp/solver/detail/ResolverContext.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/ResolverContext.cc (original) +++ trunk/libzypp/zypp/solver/detail/ResolverContext.cc Fri Aug 31 14:08:04 2007 @@ -1242,7 +1242,7 @@ if (info->type() == RESOLVER_INFO_TYPE_UNINSTALL_LOCKED) { for (PoolItemList::const_iterator iter = _ignoreInstalledItem.begin(); iter != _ignoreInstalledItem.end(); iter++) { if (info->affected() == *iter) { - DBG << "ignore keep installed: " << info->affected() << endl; + XXX << "ignore keep installed: " << info->affected() << endl; is_error = false; break; } @@ -1656,7 +1656,7 @@ ResStatus statusInstalled = context->getStatus (installedItem); if (installedItem.status().isToBeUninstalled() && installedItem.status().isByUser()){ - DBG << provider << " would satify the requirement but it has been selected for removing by the user." << endl; + XXX << provider << " would satify the requirement but it has been selected for removing by the user." << endl; flag = false; } } @@ -1742,7 +1742,7 @@ for (PoolItemList::const_iterator iter = _ignoreInstalledItem.begin(); iter != _ignoreInstalledItem.end(); iter++) { if (item == *iter) { - DBG << "ignore parallel install: " << item << endl; + XXX << "ignore parallel install: " << item << endl; return false; } } @@ -1753,7 +1753,7 @@ info.flag = false; foreachMarked (dup_name_check_cb, (void *)&info); if (info.flag) { - DBG << "isParallelInstall!!(" << item << ", " << info.foundItem << ")" << endl; + XXX << "isParallelInstall!!(" << item << ", " << info.foundItem << ")" << endl; } return info.flag; } @@ -1966,24 +1966,24 @@ if (_preferHighestVersion) { // comparing versions cmp = cmpVersion; - DBG << "Comparing versions returned :" << cmp << endl; + XXX << "Comparing versions returned :" << cmp << endl; if (cmp == 0) { // High numbers are good... we don't want solutions containing low-priority channels. // Repo priority which has been set externally cmp = num_cmp (_min_priority, context->_min_priority); - DBG << "Comparing priority returned :" << cmp << endl; + XXX << "Comparing priority returned :" << cmp << endl; if (cmp == 0) { // High numbers are bad. Less churn is better. cmp = rev_num_cmp (churn_factor (this), churn_factor (context)); - DBG << "Comparing churn_factor returned :" << cmp << endl; + XXX << "Comparing churn_factor returned :" << cmp << endl; if (cmp == 0) { // Comparing repositorys regarding the items which has to be installed cmp = cmpRepo; - DBG << "Comparing repositorys returned :" << cmp << endl; + XXX << "Comparing repositorys returned :" << cmp << endl; if (cmp == 0) { // High numbers are bad. Bigger #s means more penalties. cmp = rev_num_cmp (_other_penalties, context->_other_penalties); - DBG << "Comparing other penalties returned :" << cmp << endl; + XXX << "Comparing other penalties returned :" << cmp << endl; } } } @@ -1992,23 +1992,23 @@ // less transaction will be prefered // High numbers are bad. Less churn is better. cmp = rev_num_cmp (churn_factor (this), churn_factor (context)); - DBG << "Comparing churn_factor returned :" << cmp << endl; + XXX << "Comparing churn_factor returned :" << cmp << endl; if (cmp == 0) { // High numbers are good... we don't want solutions containing low-priority channels. // Repo priority which has been set externally cmp = num_cmp (_min_priority, context->_min_priority); - DBG << "Comparing priority returned :" << cmp << endl; + XXX << "Comparing priority returned :" << cmp << endl; if (cmp == 0) { cmp = cmpVersion; - DBG << "Comparing versions returned :" << cmp << endl; + XXX << "Comparing versions returned :" << cmp << endl; if (cmp == 0) { // Comparing repositorys regarding the items which has to be installed cmp = cmpRepo; - DBG << "Comparing repositorys returned :" << cmp << endl; + XXX << "Comparing repositorys returned :" << cmp << endl; if (cmp == 0) { // High numbers are bad. Bigger #s means more penalties. cmp = rev_num_cmp (_other_penalties, context->_other_penalties); - DBG << "Comparing other penalties returned :" << cmp << endl; + XXX << "Comparing other penalties returned :" << cmp << endl; } } } Modified: trunk/libzypp/zypp/solver/detail/Resolver_problems.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver_problems.cc (original) +++ trunk/libzypp/zypp/solver/detail/Resolver_problems.cc Fri Aug 31 14:08:04 2007 @@ -398,8 +398,8 @@ bool problem_created = false; - DBG << "Problem: " << *info; - DBG << "; Evaluate solutions..." << endl; + MIL << "Problem: " << *info; + XXX << "; Evaluate solutions..." << endl; string what; string details; -- 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] r7052 - /trunk/libzypp/zypp/solver/detail/Resolver_problems.cc
by kkaempf＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: kkaempf Date: Fri Aug 31 14:05:13 2007 New Revision: 7052 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7052&view=rev Log: 4 blank indentation on details Modified: trunk/libzypp/zypp/solver/detail/Resolver_problems.cc Modified: trunk/libzypp/zypp/solver/detail/Resolver_problems.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver_problems.cc (original) +++ trunk/libzypp/zypp/solver/detail/Resolver_problems.cc Fri Aug 31 14:05:13 2007 @@ -322,7 +322,7 @@ std::list<std::string>::iterator it; for (it = details.begin(); it != details.end(); ++it) { - result += " "; + result += " "; result += *it; result += "\n"; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0