May 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <libzypp> master : Prepare support for additional (non string) predicates in PoolQueryMatcher.
by Michael Andres 28 May '09

28 May '09

ref: refs/heads/master commit 84578a55ce28dfdbd885d1904f9543b55c5367ea Author: Michael Andres <ma(a)suse.de> Date: Thu May 28 13:01:41 2009 +0200 Prepare support for additional (non string) predicates in PoolQueryMatcher. --- zypp/PoolQuery.cc | 77 ++++++++++++++++++++++++++++++++++++++++------------ zypp/PoolQuery.h | 15 ++++++++++ 2 files changed, 74 insertions(+), 18 deletions(-) diff --git a/zypp/PoolQuery.cc b/zypp/PoolQuery.cc index f7cdc85..b14d578 100644 --- a/zypp/PoolQuery.cc +++ b/zypp/PoolQuery.cc @@ -25,11 +25,6 @@ #include "zypp/PoolQuery.h" -extern "C" -{ -//#include "satsolver/repo.h" -} - #undef ZYPP_BASE_LOGGER_LOGGROUP #define ZYPP_BASE_LOGGER_LOGGROUP "PoolQuery" @@ -41,6 +36,54 @@ namespace zypp { ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// + namespace + { ///////////////////////////////////////////////////////////////// + + /** Match data per attribtue. + * + * This includes the attribute itself, an optional \ref sat::AttrMatcher + * to restrict the query to certain string values, and an optional + * boolean \ref Predicate that may apply further restrictions that can + * not be expressed by the \ref attrMatcher. + * + * Example for such a \ref predicate would be an additional edition range + * check whan looking for dependencies. The \ref attrMatcher would + * find potential matches by looking at the dependencies name, the + * predicate will then check the edition ranges. + * + * As the \ref predicate takes an iterator pointing to the current + * match, it's also suitable for sub-structure (flexarray) inspection + * (\see \ref sat::LookupAttr::iterator::solvAttrSubEntry). + */ + struct AttrMatchData + { + typedef function<bool(sat::LookupAttr::iterator)> Predicate; + + static bool always( sat::LookupAttr::iterator ) { return true; } + static bool never( sat::LookupAttr::iterator ) { return false; } + + AttrMatchData( sat::SolvAttr attr_r, const sat::AttrMatcher & attrMatcher_r ) + : attr( attr_r ) + , attrMatcher( attrMatcher_r ) + { /*predicate = always;*/ } + + sat::SolvAttr attr; + sat::AttrMatcher attrMatcher; + Predicate predicate; + }; + + std::ostream & operator<<( std::ostream & str, const AttrMatchData & obj ) + { + return str << obj.attr << ": " << obj.attrMatcher << ( obj.predicate ? " (+predicate)" : "" ); + } + + typedef std::list<AttrMatchData> AttrMatchList; + + } ///////////////////////////////////////////////////////////////// + // namespace + /////////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// // // CLASS NAME : PoolQuery::Impl // @@ -97,8 +140,7 @@ namespace zypp void compile() const; /** AttrMatcher per attribtue. */ - typedef std::pair<sat::SolvAttr,sat::AttrMatcher> AttrMatchData; - mutable std::vector<AttrMatchData> _attrMatchList; + mutable AttrMatchList _attrMatchList; private: /** Pass flags from \ref compile, as they may have been changed. */ @@ -266,7 +308,7 @@ attremptycheckend: // Check here, whether all involved regex compile. for_( it, _attrMatchList.begin(), _attrMatchList.end() ) { - it->second.compile(); // throws on error + it->attrMatcher.compile(); // throws on error } //DBG << asString() << endl; } @@ -428,7 +470,7 @@ attremptycheckend: { for_( it, _attrMatchList.begin(), _attrMatchList.end() ) { - o << "* " << it->first << ": " << it->second << endl; + o << "* " << *it << endl; } } return o.str(); @@ -990,7 +1032,6 @@ attremptycheckend: { public: typedef sat::LookupAttr::iterator base_iterator; - typedef std::pair<sat::SolvAttr,sat::AttrMatcher> AttrMatchData; public: const base_iterator & end() const @@ -1063,10 +1104,10 @@ attremptycheckend: // Attribute restriction: if ( _attrMatchList.size() == 1 ) // all (SolvAttr::allAttr) or 1 attr { - const AttrMatchData & matchData( _attrMatchList[0] ); - q.setAttr( matchData.first ); - if ( matchData.second ) // empty searchstring matches always - q.setAttrMatcher( matchData.second ); + const AttrMatchData & matchData( _attrMatchList.front() ); + q.setAttr( matchData.attr ); + if ( matchData.attrMatcher ) // empty searchstring matches always + q.setAttrMatcher( matchData.attrMatcher ); } else // more than 1 attr (but not all) { @@ -1131,9 +1172,9 @@ attremptycheckend: for_( mi, _attrMatchList.begin(), _attrMatchList.end() ) { const AttrMatchData & matchData( *mi ); - sat::LookupAttr q( matchData.first, inSolvable ); - if ( matchData.second ) // empty searchstring matches always - q.setAttrMatcher( matchData.second ); + sat::LookupAttr q( matchData.attr, inSolvable ); + if ( matchData.attrMatcher ) // empty searchstring matches always + q.setAttrMatcher( matchData.attrMatcher ); if ( ! q.empty() ) return true; } @@ -1152,7 +1193,7 @@ attremptycheckend: /** Installed status filter flags. \see PoolQuery::StatusFilter */ int _status_flags; /** AttrMatcher per attribtue. */ - std::vector<AttrMatchData> _attrMatchList; + AttrMatchList _attrMatchList; }; /////////////////////////////////////////////////////////////////// diff --git a/zypp/PoolQuery.h b/zypp/PoolQuery.h index 49af6ae..0bf38ca 100644 --- a/zypp/PoolQuery.h +++ b/zypp/PoolQuery.h @@ -193,6 +193,13 @@ namespace zypp * This can be changed by (not yet implemented) \ref setRequireAll() * method. * + * \note Though it is possible to use dependency attributes like + * \ref Solv::Attr::provides here, note that the query string is + * matched against a dependencies \c "name" part only. Any + * <tt>"op edition"</tt> part of a \ref Capability is \b not + * considered at all. \see \ref addDependency on how to query for + * capabilities including edition ranges. + * * \note Solvables of a kind not supporting the specified attribute will * <b>not</b> be returned. * \todo check the above @@ -204,6 +211,14 @@ namespace zypp */ void addAttribute(const sat::SolvAttr & attr, const std::string & value = ""); + /* + * Query for matching dependency attributes. + * + * \throws Exception if \a attr is not a dependency attribute + */ + //void addDependency( const sat::SolvAttr & attr, Capability cap_r ); + //void addDependency( const sat::SolvAttr & attr, const std::string & name = ""); + /** * Set version condition. This will filter out solvables not matching * <tt>solvableEdition \a op \a edition</tt>. -- 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] <libzypp> master : changes 6.6.0
by Michael Andres 28 May '09

28 May '09

ref: refs/heads/master commit cb079b6a8c30db03bf3edd5a7fe7e65dc9199331 Author: Michael Andres <ma(a)suse.de> Date: Thu May 28 12:54:29 2009 +0200 changes 6.6.0 --- VERSION.cmake | 8 ++++---- package/libzypp.changes | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 21d7717..5e4f3f6 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -59,10 +59,10 @@ # changes file. See './mkChangelog -h' for help. # SET(LIBZYPP_MAJOR "6") -SET(LIBZYPP_COMPATMINOR "5") -SET(LIBZYPP_MINOR "5") -SET(LIBZYPP_PATCH "2") +SET(LIBZYPP_COMPATMINOR "6") +SET(LIBZYPP_MINOR "6") +SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 6.5.2 (5) +# LAST RELEASED: 6.6.0 (6) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index 559d25e..5352749 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 28 12:53:02 CEST 2009 - ma(a)suse.de + +- New solver.allowVendorChange expert option in zypp.conf. +- version 6.6.0 (6) + +------------------------------------------------------------------- Wed May 20 14:23:07 CEST 2009 - ma(a)suse.de - Fix lost housekeeping data in modifyRepo (bnc #503207) -- 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] <sat-solver> master : - rename dirpool_create to dirpool_init, as it just initializes the data
by Michael Schroeder 28 May '09

28 May '09

ref: refs/heads/master commit 72b92b072af33f235ed413136d1d5e57121d9da0 Author: Michael Schroeder <mls(a)suse.de> Date: Thu May 28 12:08:04 2009 +0200 - rename dirpool_create to dirpool_init, as it just initializes the data --- src/dirpool.c | 2 +- src/dirpool.h | 2 +- tools/repo_write.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dirpool.c b/src/dirpool.c index b0b476d..915e7bc 100644 --- a/src/dirpool.c +++ b/src/dirpool.c @@ -15,7 +15,7 @@ #define DIR_BLOCK 127 void -dirpool_create(Dirpool *dp) +dirpool_init(Dirpool *dp) { memset(dp, 0, sizeof(*dp)); } diff --git a/src/dirpool.h b/src/dirpool.h index 3cff081..2dec7e6 100644 --- a/src/dirpool.h +++ b/src/dirpool.h @@ -17,7 +17,7 @@ typedef struct _Dirpool { Id *dirtraverse; } Dirpool; -void dirpool_create(Dirpool *dp); +void dirpool_init(Dirpool *dp); void dirpool_free(Dirpool *dp); void dirpool_make_dirtraverse(Dirpool *dp); diff --git a/tools/repo_write.c b/tools/repo_write.c index f669a01..6d48942 100644 --- a/tools/repo_write.c +++ b/tools/repo_write.c @@ -1217,7 +1217,7 @@ repo_write(Repo *repo, FILE *fp, int (*keyfilter)(Repo *repo, Repokey *key, void { dirpool = &owndirpool; dirpooldata = 0; - dirpool_create(dirpool); + dirpool_init(dirpool); cbdata.owndirpool = dirpool; } else if (dirpool) -- 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] <sat-solver> master : - fix noprovide handling in findupdate
by Michael Schroeder 28 May '09

28 May '09

ref: refs/heads/master commit cf732c0bea5c0e5d1ad19898ddc085bbc7db84e1 Author: Michael Schroeder <mls(a)suse.de> Date: Thu May 28 11:13:25 2009 +0200 - fix noprovide handling in findupdate - add stringify hack - add missing pool_lookup functions --- src/policy.c | 4 ++- src/pool.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/pool.h | 7 +++++ src/repodata.c | 3 +- src/solver.c | 1 - 5 files changed, 80 insertions(+), 3 deletions(-) diff --git a/src/policy.c b/src/policy.c index 64274ec..0782592 100644 --- a/src/policy.c +++ b/src/policy.c @@ -528,6 +528,7 @@ policy_findupdatepackages(Solver *solv, Solvable *s, Queue *qs, int allow_all) Id p, pp, n, p2, pp2; Id obs, *obsp; Solvable *ps; + int haveprovobs = 0; queue_empty(qs); @@ -576,6 +577,7 @@ policy_findupdatepackages(Solver *solv, Solvable *s, Queue *qs, int allow_all) /* here we have 'p' with a matching provides/obsoletes combination * thus flagging p as a valid update candidate for s */ + haveprovobs = 1; } else continue; @@ -587,7 +589,7 @@ policy_findupdatepackages(Solver *solv, Solvable *s, Queue *qs, int allow_all) } /* if we have found some valid candidates and noupdateprovide is not set, we're done. otherwise we fallback to all obsoletes */ - if (!solv->noupdateprovide && qs->count) + if (!solv->noupdateprovide && haveprovobs) return; if (solv->obsoletes && solv->obsoletes[n - solv->installed->start]) { diff --git a/src/pool.c b/src/pool.c index 0921904..56d5747 100644 --- a/src/pool.c +++ b/src/pool.c @@ -1641,4 +1641,72 @@ pool_trivial_installable(Pool *pool, Map *installedmap, Queue *pkgs, Queue *res) pool_trivial_installable_noobsoletesmap(pool, installedmap, pkgs, res, 0); } +const char * +pool_lookup_str(Pool *pool, Id entry, Id keyname) +{ + if (entry == SOLVID_POS && pool->pos.repo) + return repodata_lookup_str(pool->pos.repo->repodata + pool->pos.repodataid, SOLVID_POS, keyname); + if (entry <= 0) + return 0; + return solvable_lookup_str(pool->solvables + entry, keyname); +} + +Id +pool_lookup_id(Pool *pool, Id entry, Id keyname) +{ + if (entry == SOLVID_POS && pool->pos.repo) + return repodata_lookup_id(pool->pos.repo->repodata + pool->pos.repodataid, SOLVID_POS, keyname); + if (entry <= 0) + return 0; + return solvable_lookup_id(pool->solvables + entry, keyname); +} + +unsigned int +pool_lookup_num(Pool *pool, Id entry, Id keyname, unsigned int notfound) +{ + if (entry == SOLVID_POS && pool->pos.repo) + { + unsigned int value; + if (repodata_lookup_num(pool->pos.repo->repodata + pool->pos.repodataid, SOLVID_POS, keyname, &value)) + return value; + return notfound; + } + if (entry <= 0) + return notfound; + return solvable_lookup_num(pool->solvables + entry, keyname, notfound); +} + +int +pool_lookup_void(Pool *pool, Id entry, Id keyname) +{ + if (entry == SOLVID_POS && pool->pos.repo) + return repodata_lookup_void(pool->pos.repo->repodata + pool->pos.repodataid, SOLVID_POS, keyname); + if (entry <= 0) + return 0; + return solvable_lookup_void(pool->solvables + entry, keyname); +} + +const unsigned char * +pool_lookup_bin_checksum(Pool *pool, Id entry, Id keyname, Id *typep) +{ + if (entry == SOLVID_POS && pool->pos.repo) + return repodata_lookup_bin_checksum(pool->pos.repo->repodata + pool->pos.repodataid, SOLVID_POS, keyname, typep); + if (entry <= 0) + return 0; + return solvable_lookup_bin_checksum(pool->solvables + entry, keyname, typep); +} + +const char * +pool_lookup_checksum(Pool *pool, Id entry, Id keyname, Id *typep) +{ + if (entry == SOLVID_POS && pool->pos.repo) + { + const unsigned char *chk = repodata_lookup_bin_checksum(pool->pos.repo->repodata + pool->pos.repodataid, SOLVID_POS, keyname, typep); + return chk ? repodata_chk2str(pool->pos.repo->repodata + pool->pos.repodataid, *typep, chk) : 0; + } + if (entry <= 0) + return 0; + return solvable_lookup_checksum(pool->solvables + entry, keyname, typep); +} + // EOF diff --git a/src/pool.h b/src/pool.h index 4766fb0..085f004 100644 --- a/src/pool.h +++ b/src/pool.h @@ -301,6 +301,13 @@ int pool_calc_installsizechange(Pool *pool, Map *installedmap); void pool_trivial_installable(Pool *pool, Map *installedmap, Queue *pkgs, Queue *res); void pool_trivial_installable_noobsoletesmap(Pool *pool, Map *installedmap, Queue *pkgs, Queue *res, Map *noobsoletesmap); +const char *pool_lookup_str(Pool *pool, Id entry, Id keyname); +Id pool_lookup_id(Pool *pool, Id entry, Id keyname); +unsigned int pool_lookup_num(Pool *pool, Id entry, Id keyname, unsigned int notfound); +int pool_lookup_void(Pool *pool, Id entry, Id keyname); +const unsigned char *pool_lookup_bin_checksum(Pool *pool, Id entry, Id keyname, Id *typep); +const char *pool_lookup_checksum(Pool *pool, Id entry, Id keyname, Id *typep); + /* loop over all providers of d */ #define FOR_PROVIDES(v, vp, d) \ diff --git a/src/repodata.c b/src/repodata.c index be386e4..887da4d 100644 --- a/src/repodata.c +++ b/src/repodata.c @@ -1389,10 +1389,11 @@ dataiterator_match(Dataiterator *di, Datamatcher *ma) { if (!repodata_stringify(di->pool, di->data, di->key, &di->kv, di->flags)) return 0; + if (!ma) + return 1; return datamatcher_match(ma, di->kv.str); } - /************************************************************************ * data modify functions */ diff --git a/src/solver.c b/src/solver.c index f551865..e17205b 100644 --- a/src/solver.c +++ b/src/solver.c @@ -21,7 +21,6 @@ #include "bitmap.h" #include "pool.h" #include "util.h" -#include "evr.h" #include "policy.h" #include "solverdebug.h" -- 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] <libzypp> master : Add SolvAttr constants for vendor and dependencies.
by Michael Andres 27 May '09

27 May '09

ref: refs/heads/master commit 139344772dfd10b247deccb59c7a913e8ae26400 Author: Michael Andres <ma(a)suse.de> Date: Wed May 27 17:54:40 2009 +0200 Add SolvAttr constants for vendor and dependencies. - also remove unused SolvAttr::filenames --- zypp/sat/SolvAttr.cc | 11 ++++++++++- zypp/sat/SolvAttr.h | 19 +++++++++++++------ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/zypp/sat/SolvAttr.cc b/zypp/sat/SolvAttr.cc index 937f3d7..83a98d3 100644 --- a/zypp/sat/SolvAttr.cc +++ b/zypp/sat/SolvAttr.cc @@ -36,6 +36,16 @@ namespace sat const SolvAttr SolvAttr::name ( SOLVABLE_NAME ); const SolvAttr SolvAttr::edition ( SOLVABLE_EVR ); const SolvAttr SolvAttr::arch ( SOLVABLE_ARCH ); + const SolvAttr SolvAttr::vendor ( SOLVABLE_VENDOR ); + + const SolvAttr SolvAttr::provides ( SOLVABLE_PROVIDES ); + const SolvAttr SolvAttr::obsoletes ( SOLVABLE_OBSOLETES ); + const SolvAttr SolvAttr::conflicts ( SOLVABLE_CONFLICTS ); + const SolvAttr SolvAttr::requires ( SOLVABLE_REQUIRES ); + const SolvAttr SolvAttr::recommends ( SOLVABLE_RECOMMENDS ); + const SolvAttr SolvAttr::suggests ( SOLVABLE_SUGGESTS ); + const SolvAttr SolvAttr::supplements ( SOLVABLE_SUPPLEMENTS ); + const SolvAttr SolvAttr::enhances ( SOLVABLE_ENHANCES ); const SolvAttr SolvAttr::summary ( SOLVABLE_SUMMARY ); // translated const SolvAttr SolvAttr::description ( SOLVABLE_DESCRIPTION ); // translated @@ -63,7 +73,6 @@ namespace sat const SolvAttr SolvAttr::keywords ( SOLVABLE_KEYWORDS ); const SolvAttr SolvAttr::sourcesize ( "sourcesize" ); const SolvAttr SolvAttr::authors ( SOLVABLE_AUTHORS ); - const SolvAttr SolvAttr::filenames ( "filenames" ); const SolvAttr SolvAttr::filelist ( SOLVABLE_FILELIST ); const SolvAttr SolvAttr::sourcearch ( SOLVABLE_SOURCEARCH ); const SolvAttr SolvAttr::sourcename ( SOLVABLE_SOURCENAME ); diff --git a/zypp/sat/SolvAttr.h b/zypp/sat/SolvAttr.h index d14230c..a15f900 100644 --- a/zypp/sat/SolvAttr.h +++ b/zypp/sat/SolvAttr.h @@ -45,17 +45,25 @@ namespace sat /** Value representing \c noAttr (<tt>""</tt>)*/ static const SolvAttr noAttr; - /** \name special solvable attributes which are part of the ::Solvable struct - * - * \todo can these be used in LookupAttr currently? - * \todo add dependencies here? Or move all this stuff elsewhere? - */ + /** \name special solvable attributes which are part of the ::Solvable struct */ //@{ static const SolvAttr name; static const SolvAttr edition; static const SolvAttr arch; + static const SolvAttr vendor; //@} + /** \name dependency attrigutes */ + //@{ + static const SolvAttr provides; + static const SolvAttr obsoletes; + static const SolvAttr conflicts; + static const SolvAttr requires; + static const SolvAttr recommends; + static const SolvAttr suggests; + static const SolvAttr supplements; + static const SolvAttr enhances; + /** \name common */ //@{ static const SolvAttr summary; @@ -86,7 +94,6 @@ namespace sat static const SolvAttr keywords; static const SolvAttr sourcesize; static const SolvAttr authors; - static const SolvAttr filenames; static const SolvAttr filelist; static const SolvAttr sourcearch; static const SolvAttr sourcename; -- 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] <libzypp> master : Remove deprecated Package::filenames method
by Michael Andres 27 May '09

27 May '09

ref: refs/heads/master commit 96405d6ca6b6b34d559a8aab7134146db58fca3b Author: Michael Andres <ma(a)suse.de> Date: Wed May 27 16:50:52 2009 +0200 Remove deprecated Package::filenames method --- zypp/Package.cc | 6 ------ zypp/Package.h | 4 ---- 2 files changed, 0 insertions(+), 10 deletions(-) diff --git a/zypp/Package.cc b/zypp/Package.cc index c4cd067..c4de93c 100644 --- a/zypp/Package.cc +++ b/zypp/Package.cc @@ -125,12 +125,6 @@ namespace zypp Package::FileList Package::filelist() const { return FileList( sat::SolvAttr::filelist, satSolvable() ); } - std::list<std::string> Package::filenames() const - { - FileList f( filelist() ); - return std::list<std::string>( f.begin(), f.end() ); - } - CheckSum Package::checksum() const { return lookupCheckSumAttribute( sat::SolvAttr::checksum ); } diff --git a/zypp/Package.h b/zypp/Package.h index f952d9d..446a29a 100644 --- a/zypp/Package.h +++ b/zypp/Package.h @@ -23,8 +23,6 @@ namespace zypp DEFINE_PTR_TYPE(Package); - - /////////////////////////////////////////////////////////////////// // // CLASS NAME : Package @@ -87,8 +85,6 @@ namespace zypp * consume much memory. */ FileList filelist() const; - /** \deprecated Use filelist, it's faster and saves memory. */ - std::list<std::string> filenames() const ZYPP_DEPRECATED; /** \name Source package handling */ -- 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] <sat-solver> SuSE-Code-11-Branch : - fix provides/obsoletes check in findupdatepackages
by Michael Schroeder 27 May '09

27 May '09

ref: refs/heads/SuSE-Code-11-Branch commit 0f9258f22b43e1e1f9be798bcad7764f6f7e7d5e Author: Michael Schroeder <mls(a)suse.de> Date: Wed May 27 14:03:43 2009 +0200 - fix provides/obsoletes check in findupdatepackages --- src/policy.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/policy.c b/src/policy.c index 0bbe7b1..713c193 100644 --- a/src/policy.c +++ b/src/policy.c @@ -452,6 +452,7 @@ policy_findupdatepackages(Solver *solv, Solvable *s, Queue *qs, int allow_all) Id p, pp, n, p2, pp2; Id obs, *obsp; Solvable *ps; + int haveprovobs = 0; queue_empty(qs); @@ -500,6 +501,7 @@ policy_findupdatepackages(Solver *solv, Solvable *s, Queue *qs, int allow_all) /* here we have 'p' with a matching provides/obsoletes combination * thus flagging p as a valid update candidate for s */ + haveprovobs = 1; } else continue; @@ -511,7 +513,7 @@ policy_findupdatepackages(Solver *solv, Solvable *s, Queue *qs, int allow_all) } /* if we have found some valid candidates and noupdateprovide is not set, we're done. otherwise we fallback to all obsoletes */ - if (!solv->noupdateprovide && qs->count) + if (!solv->noupdateprovide && haveprovobs) return; if (solv->obsoletes && solv->obsoletes[n - solv->installed->start]) { -- 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] <libzypp> master : New Resolver interface to turn vendor checks on/off.
by Michael Andres 27 May '09

27 May '09

ref: refs/heads/master commit b0311bcc438c05a82e0e1d30a32068c7188e561f Author: Michael Andres <ma(a)suse.de> Date: Wed May 27 13:55:20 2009 +0200 New Resolver interface to turn vendor checks on/off. - New setAllowVendorChange/setDefaultAllowVendorChange/allowVendorChange - Cleanup Resolvers argument and return value types. Missing references, missing/superfluous const. --- zypp/Resolver.cc | 105 ++++++++++++------------- zypp/Resolver.h | 56 ++++++++----- zypp/VendorAttr.h | 7 +- zypp/solver/detail/Resolver.cc | 169 +++++++++++++++++----------------------- zypp/solver/detail/Resolver.h | 99 +++++++++++++----------- zypp/solver/detail/Testcase.cc | 6 +- 6 files changed, 213 insertions(+), 229 deletions(-) diff --git a/zypp/Resolver.cc b/zypp/Resolver.cc index ba3bfa0..055dcc1 100644 --- a/zypp/Resolver.cc +++ b/zypp/Resolver.cc @@ -27,16 +27,7 @@ namespace zypp using namespace solver; IMPL_PTR_TYPE(Resolver); -#if 0 - Resolver_Ptr Resolver::_resolver = NULL; - Resolver_Ptr Resolver::resolver() - { - if (_resolver == NULL) { - _resolver = new Resolver(); - } - return _resolver; - } -#endif + /////////////////////////////////////////////////////////////////// // // METHOD NAME : Resolver::Resolver @@ -62,75 +53,81 @@ namespace zypp /////////////////////////////////////////////////////////////////// bool Resolver::verifySystem () { return _pimpl->verifySystem(); } + bool Resolver::resolvePool () { return _pimpl->resolvePool(); } - bool Resolver::resolveQueue (zypp::solver::detail::SolverQueueItemList & queue) + + bool Resolver::resolveQueue( solver::detail::SolverQueueItemList & queue ) { return _pimpl->resolveQueue(queue); } + void Resolver::undo() { _pimpl->undo(); } + ResolverProblemList Resolver::problems () { return _pimpl->problems (); } + void Resolver::applySolutions( const ProblemSolutionList & solutions ) { _pimpl->applySolutions (solutions); } + bool Resolver::doUpgrade( UpgradeStatistics & opt_stats_r ) { return _pimpl->doUpgrade(opt_stats_r); } + void Resolver::doUpdate() { _pimpl->doUpdate(); } - void Resolver::setForceResolve( const bool force ) - { _pimpl->setForceResolve( force ); } - bool Resolver::forceResolve() - { return _pimpl->forceResolve(); } - void Resolver::setIgnoreAlreadyRecommended - (const bool ignoreAlreadyRecommended) - { _pimpl->setIgnorealreadyrecommended (ignoreAlreadyRecommended); } - bool Resolver::ignoreAlreadyRecommended() - { return _pimpl->ignorealreadyrecommended(); } - void Resolver::setOnlyRequires( const bool onlyRequires ) - { onlyRequires ? _pimpl->setOnlyRequires( true ) : _pimpl->setOnlyRequires( false ); } - void Resolver::resetOnlyRequires() - { _pimpl->setOnlyRequires( indeterminate ); } - bool Resolver::onlyRequires() - { - if (indeterminate(_pimpl->onlyRequires())) - return ZConfig::instance().solver_onlyRequires(); - else - return _pimpl->onlyRequires(); - } + + void Resolver::setForceResolve( bool yesno_r ) { _pimpl->setForceResolve( yesno_r ); } + bool Resolver::forceResolve() { return _pimpl->forceResolve(); } + + void Resolver::setIgnoreAlreadyRecommended( bool yesno_r) { _pimpl->setIgnoreAlreadyRecommended( yesno_r ); } + bool Resolver::ignoreAlreadyRecommended() { return _pimpl->ignoreAlreadyRecommended(); } + + void Resolver::setOnlyRequires( bool yesno_r ) { _pimpl->setOnlyRequires( yesno_r ); } + void Resolver::resetOnlyRequires() { _pimpl->setOnlyRequires( indeterminate ); } + bool Resolver::onlyRequires() { return _pimpl->onlyRequires(); } + + void Resolver::setAllowVendorChange( bool yesno_r ) { _pimpl->setAllowVendorChange( yesno_r ); } + void Resolver::setDefaultAllowVendorChange() { _pimpl->setAllowVendorChange( indeterminate ); } + bool Resolver::allowVendorChange() const { return _pimpl->allowVendorChange(); } void Resolver::setSystemVerification( bool yesno_r ) { _pimpl->setVerifyingMode( yesno_r ); } - void Resolver::setDefaultSystemVerification() { _pimpl->setVerifyingMode(indeterminate ); } + void Resolver::setDefaultSystemVerification() { _pimpl->setVerifyingMode( indeterminate ); } bool Resolver::systemVerification() const { return _pimpl->isVerifyingMode(); } void Resolver::setSolveSrcPackages( bool yesno_r ) { _pimpl->setSolveSrcPackages( yesno_r ); } - void Resolver::setDefaultSolveSrcPackages() { _pimpl->setSolveSrcPackages(indeterminate ); } + void Resolver::setDefaultSolveSrcPackages() { _pimpl->setSolveSrcPackages( indeterminate ); } bool Resolver::solveSrcPackages() const { return _pimpl->solveSrcPackages(); } - void Resolver::addRequire (const Capability & capability) - { _pimpl->addExtraRequire( capability ); } - void Resolver::addConflict (const Capability & capability) - { _pimpl->addExtraConflict( capability ); } - void Resolver::removeRequire (const Capability & capability) - { _pimpl->removeExtraRequire( capability ); } - void Resolver::removeConflict (const Capability & capability) - { _pimpl->removeExtraConflict( capability ); } - const CapabilitySet Resolver::getRequire () - { return _pimpl->extraRequires();} - const CapabilitySet Resolver::getConflict () - { return _pimpl->extraConflicts();} - std::list<PoolItem> Resolver::problematicUpdateItems( void ) const + + void Resolver::addRequire( const Capability & capability ) { _pimpl->addExtraRequire( capability ); } + void Resolver::addConflict( const Capability & capability ) { _pimpl->addExtraConflict( capability ); } + void Resolver::removeRequire( const Capability & capability ) { _pimpl->removeExtraRequire( capability ); } + void Resolver::removeConflict( const Capability & capability ){ _pimpl->removeExtraConflict( capability ); } + + CapabilitySet Resolver::getRequire() { return _pimpl->extraRequires(); } + CapabilitySet Resolver::getConflict() { return _pimpl->extraConflicts(); } + + std::list<PoolItem> Resolver::problematicUpdateItems() const { return _pimpl->problematicUpdateItems(); } - bool Resolver::createSolverTestcase (const std::string & dumpPath) - { solver::detail::Testcase testcase (dumpPath); - return testcase.createTestcase(*_pimpl);} - const solver::detail::ItemCapKindList Resolver::isInstalledBy (const PoolItem item) + + bool Resolver::createSolverTestcase( const std::string & dumpPath ) + { + solver::detail::Testcase testcase (dumpPath); + return testcase.createTestcase(*_pimpl); + } + + solver::detail::ItemCapKindList Resolver::isInstalledBy( const PoolItem & item ) { return _pimpl->isInstalledBy (item); } - const solver::detail::ItemCapKindList Resolver::installs (const PoolItem item) + + solver::detail::ItemCapKindList Resolver::installs( const PoolItem & item ) { return _pimpl->installs (item); } - const solver::detail::ItemCapKindList Resolver::satifiedByInstalled (const PoolItem item) + + solver::detail::ItemCapKindList Resolver::satifiedByInstalled( const PoolItem & item ) { return _pimpl->satifiedByInstalled (item); } - const solver::detail::ItemCapKindList Resolver::installedSatisfied (const PoolItem item) + + solver::detail::ItemCapKindList Resolver::installedSatisfied( const PoolItem & item ) { return _pimpl->installedSatisfied (item); } - void Resolver::reset () + + void Resolver::reset() { _pimpl->reset( false ); /* Do not keep extra requires/conflicts */ } diff --git a/zypp/Resolver.h b/zypp/Resolver.h index 01e94d0..4b422ed 100644 --- a/zypp/Resolver.h +++ b/zypp/Resolver.h @@ -58,7 +58,7 @@ namespace zypp * * Call \ref setSystemVerification to turn of this mode. **/ - bool verifySystem (); + bool verifySystem(); /** @@ -75,7 +75,7 @@ namespace zypp * the latter case, use problems() and later applySolutions() * below. **/ - bool resolvePool (void); + bool resolvePool(); /** @@ -95,18 +95,18 @@ namespace zypp * to e.g. the selectables. * **/ - bool resolveQueue (solver::detail::SolverQueueItemList & queue); + bool resolveQueue( solver::detail::SolverQueueItemList & queue ); /* * Undo solver changes done in resolvePool() * Throwing away all ignored dependencies. */ - void undo( void ); + void undo(); /* * Resets solver information and verify option. */ - void reset( void ); + void reset(); /** @@ -144,7 +144,7 @@ namespace zypp * Return the list of deleted items. * Note : This list is valid after the call doUpgrade() only. **/ - std::list<PoolItem> problematicUpdateItems( void ) const; + std::list<PoolItem> problematicUpdateItems() const; /** * Return the dependency problems found by the last call to @@ -166,14 +166,14 @@ namespace zypp * have unfulfilled requirements. * This behaviour is favourited by ZMD. **/ - void setForceResolve (const bool force); + void setForceResolve( bool force ); bool forceResolve(); /** * Ignore recommended packages that were already recommended by * the installed packages **/ - void setIgnoreAlreadyRecommended (const bool ignoreAlreadyRecommended); + void setIgnoreAlreadyRecommended( bool yesno_r ); bool ignoreAlreadyRecommended(); /** @@ -181,11 +181,23 @@ namespace zypp * So recommended packages, language packages and packages which depend * on hardware (modalias) will not be regarded. **/ - void setOnlyRequires (const bool onlyRequires); + void setOnlyRequires( bool yesno_r ); void resetOnlyRequires(); // set back to default (described in zypp.conf) bool onlyRequires(); /** + * Setting whether the solver should allow or disallow vendor changes. + * + * If OFF (the default) the solver will replace packages with packages + * of the same (or equivalent) vendor ony. + * + * \see \ref VendorAttr for definition of vendor equivalence. + **/ + void setAllowVendorChange( bool yesno_r ); + void setDefaultAllowVendorChange(); // set back to default (in zypp.conf) + bool allowVendorChange() const; + + /** * System verification mode also monitors and repairs dependencies * of already installed packages. * \see \ref verifySystem @@ -211,37 +223,37 @@ namespace zypp * Adding additional requirement * */ - void addRequire (const Capability & capability); + void addRequire( const Capability & capability ); /** * Adding additional conflict * */ - void addConflict (const Capability & capability); + void addConflict( const Capability & capability ); /** * Remove the additional requirement set by \ref addRequire(Capability). * */ - void removeRequire (const Capability & capability); + void removeRequire( const Capability & capability ); /** * Remove the additional conflict set by \ref addConflict(Capability). * */ - void removeConflict (const Capability & capability); + void removeConflict( const Capability & capability ); /** * Get all the additional requirements set by \ref addRequire(Capability). * */ - const CapabilitySet getRequire (); + CapabilitySet getRequire(); /** * Get all the additional conflicts set by \ref addConflict(Capability). * */ - const CapabilitySet getConflict(); + CapabilitySet getConflict(); /** * Generates a solver Testcase of the current state @@ -249,7 +261,7 @@ namespace zypp * \parame dumpPath destination directory of the created directory * \return true if it was successful */ - bool createSolverTestcase (const std::string & dumpPath = "/var/log/YaST2/solverTestcase"); + bool createSolverTestcase( const std::string & dumpPath = "/var/log/YaST2/solverTestcase" ); /** * Gives information about WHO has pused an installation of an given item. @@ -265,7 +277,7 @@ namespace zypp * Note: In order to have a result start a solver run before. Not matter if it is valid or invalid. * */ - const solver::detail::ItemCapKindList isInstalledBy (const PoolItem item); + solver::detail::ItemCapKindList isInstalledBy( const PoolItem & item ); /** * Gives information about WHICH additional items will be installed due the installation of an item. @@ -281,7 +293,7 @@ namespace zypp * Note: In order to have a result start a solver run before. Not matter if it is valid or invalid. * */ - const solver::detail::ItemCapKindList installs (const PoolItem item); + solver::detail::ItemCapKindList installs( const PoolItem & item ); /** * Gives information about WHICH installed items are requested by the installation of an item. @@ -292,12 +304,12 @@ namespace zypp * initialInstallation This item has triggered the installation * Not already fullfilled requierement only. * cap Capability which has triggerd this installation - * capKind Kind of that capability (e.g. Dep::REQUIRES,Dep::RECOMMENDS,... ) + * capKind Kind of that capability (e.g. Dep::REQUIRES,Dep::RECOMMENDS,... ) * * Note: In order to have a result start a solver run before. Not matter if it is valid or invalid. * */ - const solver::detail::ItemCapKindList satifiedByInstalled(const PoolItem item); + solver::detail::ItemCapKindList satifiedByInstalled( const PoolItem & item ); /** @@ -309,12 +321,12 @@ namespace zypp * initialInstallation This item has triggered the installation * Not already fullfilled requierement only. * cap Capability which has triggerd this installation - * capKind Kind of that capability (e.g. Dep::REQUIRES,Dep::RECOMMENDS,... ) + * capKind Kind of that capability (e.g. Dep::REQUIRES,Dep::RECOMMENDS,... ) * * Note: In order to have a result start a solver run before. Not matter if it is valid or invalid. * */ - const solver::detail::ItemCapKindList installedSatisfied(const PoolItem item); + solver::detail::ItemCapKindList installedSatisfied( const PoolItem & item ); diff --git a/zypp/VendorAttr.h b/zypp/VendorAttr.h index 75528ff..55f0408 100644 --- a/zypp/VendorAttr.h +++ b/zypp/VendorAttr.h @@ -16,7 +16,6 @@ #include <string> #include <vector> -#include "zypp/base/NonCopyable.h" #include "zypp/PathInfo.h" #include "zypp/Vendor.h" @@ -31,11 +30,9 @@ namespace zypp { * * Per default vendor strings starting with \c "suse' or \c 'opensuse" * are treated equivalent. This may be changed by providing customized - * vendor description files in /etc/zypp/vendors.d. - * - * \todo remove superfluous base::NonCopyable + * vendor description files in \c /etc/zypp/vendors.d. */ -class VendorAttr : private base::NonCopyable +class VendorAttr { public: typedef std::vector<std::string> VendorList; diff --git a/zypp/solver/detail/Resolver.cc b/zypp/solver/detail/Resolver.cc index e6da90e..d980dee 100644 --- a/zypp/solver/detail/Resolver.cc +++ b/zypp/solver/detail/Resolver.cc @@ -56,8 +56,7 @@ IMPL_PTR_TYPE(Resolver); //--------------------------------------------------------------------------- -std::ostream & -Resolver::dumpOn( std::ostream & os ) const +std::ostream & Resolver::dumpOn( std::ostream & os ) const { return os << "<resolver/>"; } @@ -69,14 +68,14 @@ Resolver::Resolver (const ResPool & pool) : _pool(pool) , _satResolver(NULL) , _poolchanged(_pool.serial() ) - , _testing(false) - , _forceResolve(false) - , _upgradeMode(false) - , _updateMode(false) - , _verifying(false) - , _onlyRequires(indeterminate) - , _solveSrcPackages( false ) - , _ignorealreadyrecommended(false) + , _forceResolve (false) + , _upgradeMode (false) + , _updateMode (false) + , _verifying (false) + , _onlyRequires ( ZConfig::instance().solver_onlyRequires() ) + , _allowVendorChange ( ZConfig::instance().solver_allowVendorChange() ) + , _solveSrcPackages ( false ) + , _ignoreAlreadyRecommended (false) { sat::Pool satPool( sat::Pool::instance() ); @@ -91,14 +90,22 @@ Resolver::~Resolver() //--------------------------------------------------------------------------- -ResPool -Resolver::pool (void) const +void Resolver::setAllowVendorChange( TriBool state_r ) { - return _pool; + _allowVendorChange = indeterminate(state_r) ? ZConfig::instance().solver_allowVendorChange() : bool(state_r); } -void -Resolver::reset (bool keepExtras ) +void Resolver::setOnlyRequires( TriBool state_r ) +{ + _onlyRequires = indeterminate(state_r) ? ZConfig::instance().solver_onlyRequires() : bool(state_r); +} + +//--------------------------------------------------------------------------- + +ResPool Resolver::pool() const +{ return _pool; } + +void Resolver::reset( bool keepExtras ) { _verifying = false; @@ -113,8 +120,7 @@ Resolver::reset (bool keepExtras ) _installedSatisfied.clear(); } -void -Resolver::doUpdate() +void Resolver::doUpdate() { _updateMode = true; return _satResolver->doUpdate(); @@ -123,31 +129,19 @@ Resolver::doUpdate() PoolItemList Resolver::problematicUpdateItems() const { return _satResolver->problematicUpdateItems(); } -void -Resolver::addExtraRequire (const Capability & capability) -{ - _extra_requires.insert (capability); -} +void Resolver::addExtraRequire( const Capability & capability ) +{ _extra_requires.insert (capability); } -void -Resolver::removeExtraRequire (const Capability & capability) -{ - _extra_requires.erase (capability); -} +void Resolver::removeExtraRequire( const Capability & capability ) +{ _extra_requires.erase (capability); } -void -Resolver::addExtraConflict (const Capability & capability) -{ - _extra_conflicts.insert (capability); -} +void Resolver::addExtraConflict( const Capability & capability ) +{ _extra_conflicts.insert (capability); } -void -Resolver::removeExtraConflict (const Capability & capability) -{ - _extra_conflicts.erase (capability); -} +void Resolver::removeExtraConflict( const Capability & capability ) +{ _extra_conflicts.erase (capability); } -void Resolver::removeQueueItem (const SolverQueueItem_Ptr item) +void Resolver::removeQueueItem( SolverQueueItem_Ptr item ) { bool found = false; for (SolverQueueItemList::const_iterator iter = _added_queue_items.begin(); @@ -163,7 +157,8 @@ void Resolver::removeQueueItem (const SolverQueueItem_Ptr item) _removed_queue_items.unique (); } } -void Resolver::addQueueItem (const SolverQueueItem_Ptr item) + +void Resolver::addQueueItem( SolverQueueItem_Ptr item ) { bool found = false; for (SolverQueueItemList::const_iterator iter = _removed_queue_items.begin(); @@ -180,11 +175,8 @@ void Resolver::addQueueItem (const SolverQueueItem_Ptr item) } } -void -Resolver::addWeak (const PoolItem item) -{ - _addWeak.push_back (item); -} +void Resolver::addWeak( const PoolItem & item ) +{ _addWeak.push_back( item ); } //--------------------------------------------------------------------------- @@ -218,8 +210,7 @@ struct DoTransact : public resfilter::PoolItemFilterFunctor }; -bool -Resolver::verifySystem () +bool Resolver::verifySystem() { UndoTransact resetting (ResStatus::APPL_HIGH); @@ -238,8 +229,7 @@ Resolver::verifySystem () //---------------------------------------------------------------------------- // undo -void -Resolver::undo(void) +void Resolver::undo() { UndoTransact info(ResStatus::APPL_LOW); MIL << "*** undo ***" << endl; @@ -256,8 +246,7 @@ Resolver::undo(void) return; } -void -Resolver::solverInit() +void Resolver::solverInit() { // Solving with the satsolver static bool poolDumped = false; @@ -272,49 +261,30 @@ Resolver::solverInit() } } - _satResolver->setFixsystem(false); - _satResolver->setIgnorealreadyrecommended(false); - _satResolver->setAllowdowngrade(false); - _satResolver->setAllowarchchange(false); - _satResolver->setAllowvendorchange(false); - _satResolver->setAllowuninstall(false); - _satResolver->setUpdatesystem(false); - _satResolver->setAllowvirtualconflicts(false); - _satResolver->setNoupdateprovide(false); - _satResolver->setDosplitprovides(false); - _satResolver->setSolveSrcPackages( solveSrcPackages() ); + _satResolver->setFixsystem ( isVerifyingMode() ); + _satResolver->setIgnorealreadyrecommended ( ignoreAlreadyRecommended() ); + _satResolver->setOnlyRequires ( onlyRequires() ); + _satResolver->setAllowdowngrade (false); + _satResolver->setAllowarchchange (false); + _satResolver->setAllowvendorchange ( allowVendorChange() ); + _satResolver->setAllowuninstall ( forceResolve() ); + _satResolver->setUpdatesystem (false); + _satResolver->setAllowvirtualconflicts (false); + _satResolver->setNoupdateprovide (false); + _satResolver->setDosplitprovides (false); + _satResolver->setSolveSrcPackages ( solveSrcPackages() ); if (_upgradeMode) { - _satResolver->setAllowdowngrade(true); - _satResolver->setUpdatesystem(false); // not needed cause packages has already been evaluteted by distupgrade - _satResolver->setDosplitprovides(true); - if ( !getenv("ZYPP_NO_SAT_UPDATE") ) { - MIL << "-------------- Calling SAT Solver in distupgrade mode -------------------" << endl; - // SAT solver will do the dist update - _satResolver->setAllowarchchange(true); - _satResolver->setAllowvendorchange(true); - _satResolver->setUpdatesystem(true); - _satResolver->setDistupgrade(true); - _satResolver->setDistupgrade_removeunsupported(false); - } + // may overwrite some settings + _satResolver->setDistupgrade (true); + _satResolver->setDistupgrade_removeunsupported (false); + _satResolver->setUpdatesystem (true); + _satResolver->setAllowdowngrade (true); + _satResolver->setAllowarchchange (true); + _satResolver->setAllowvendorchange (true); + _satResolver->setDosplitprovides (true); } - if (_forceResolve) - _satResolver->setAllowuninstall(true); - - if (indeterminate(_onlyRequires)) - _satResolver->setOnlyRequires(ZConfig::instance().solver_onlyRequires()); - else if (_onlyRequires) - _satResolver->setOnlyRequires(true); - else - _satResolver->setOnlyRequires(false); - - if (_verifying) - _satResolver->setFixsystem(true); - - if (_ignorealreadyrecommended) - _satResolver->setIgnorealreadyrecommended(true); - // Resetting additional solver information _isInstalledBy.clear(); _installs.clear(); @@ -322,15 +292,13 @@ Resolver::solverInit() _installedSatisfied.clear(); } -bool -Resolver::resolvePool() +bool Resolver::resolvePool() { solverInit(); return _satResolver->resolvePool(_extra_requires, _extra_conflicts, _addWeak); } -bool -Resolver::resolveQueue(solver::detail::SolverQueueItemList & queue) +bool Resolver::resolveQueue( solver::detail::SolverQueueItemList & queue ) { solverInit(); @@ -374,8 +342,7 @@ Resolver::resolveQueue(solver::detail::SolverQueueItemList & queue) // Getting more information about the solve results -void -Resolver::collectResolverInfo(void) +void Resolver::collectResolverInfo() { if ( _satResolver && _isInstalledBy.empty() @@ -523,7 +490,8 @@ Resolver::collectResolverInfo(void) } -const ItemCapKindList Resolver::isInstalledBy (const PoolItem item) { +ItemCapKindList Resolver::isInstalledBy( const PoolItem & item ) +{ ItemCapKindList ret; collectResolverInfo(); @@ -541,7 +509,8 @@ const ItemCapKindList Resolver::isInstalledBy (const PoolItem item) { return ret; } -const ItemCapKindList Resolver::installs (const PoolItem item) { +ItemCapKindList Resolver::installs( const PoolItem & item ) +{ ItemCapKindList ret; collectResolverInfo(); @@ -559,7 +528,8 @@ const ItemCapKindList Resolver::installs (const PoolItem item) { return ret; } -const ItemCapKindList Resolver::satifiedByInstalled (const PoolItem item) { +ItemCapKindList Resolver::satifiedByInstalled( const PoolItem & item ) +{ ItemCapKindList ret; collectResolverInfo(); @@ -577,7 +547,8 @@ const ItemCapKindList Resolver::satifiedByInstalled (const PoolItem item) { return ret; } -const ItemCapKindList Resolver::installedSatisfied (const PoolItem item) { +ItemCapKindList Resolver::installedSatisfied( const PoolItem & item ) +{ ItemCapKindList ret; collectResolverInfo(); diff --git a/zypp/solver/detail/Resolver.h b/zypp/solver/detail/Resolver.h index ae04208..0b8836a 100644 --- a/zypp/solver/detail/Resolver.h +++ b/zypp/solver/detail/Resolver.h @@ -102,18 +102,22 @@ class Resolver : public base::ReferenceCounted, private base::NonCopyable { // Regard dependencies of the item weak onl PoolItemList _addWeak; + /** \name Solver flags */ + //@{ bool _forceResolve; // remove items which are conflicts with others or // have unfulfilled requirements. // This behaviour is favourited by ZMD bool _upgradeMode; // Resolver has been called with doUpgrade bool _updateMode; // Resolver has been called with doUpdate bool _verifying; // The system will be checked - TriBool _onlyRequires; // do install required resolvables only + bool _onlyRequires; // do install required resolvables only // no recommended resolvables, language // packages, hardware packages (modalias) + bool _allowVendorChange; // whether the solver should allow or disallow vendor changes. bool _solveSrcPackages; // whether to generate solver jobs for selected source packges. - bool _ignorealreadyrecommended; //ignore recommended packages that have already been recommended by the installed packages + bool _ignoreAlreadyRecommended; //ignore recommended packages that have already been recommended by the installed packages + //@} // Additional QueueItems which has to be regarded by the solver // This will be used e.g. by solution actions @@ -127,7 +131,7 @@ class Resolver : public base::ReferenceCounted, private base::NonCopyable { ItemCapKindMap _installedSatisfied; // helpers - void collectResolverInfo (void); + void collectResolverInfo(); // Unmaintained packages which does not fit to the updated system // (broken dependencies) will be deleted. @@ -138,78 +142,81 @@ class Resolver : public base::ReferenceCounted, private base::NonCopyable { public: - Resolver (const ResPool & pool); + Resolver( const ResPool & pool ); virtual ~Resolver(); // ---------------------------------- I/O virtual std::ostream & dumpOn( std::ostream & str ) const; - friend std::ostream& operator<<(std::ostream& str, const Resolver & obj) + friend std::ostream& operator<<( std::ostream& str, const Resolver & obj ) { return obj.dumpOn (str); } // ---------------------------------- methods - ResPool pool (void) const; - void setPool (const ResPool & pool) { _pool = pool; } + ResPool pool() const; + void setPool( const ResPool & pool ) { _pool = pool; } - void addExtraRequire (const Capability & capability); - void removeExtraRequire (const Capability & capability); - void addExtraConflict (const Capability & capability); - void removeExtraConflict (const Capability & capability); + void addExtraRequire( const Capability & capability ); + void removeExtraRequire( const Capability & capability ); + void addExtraConflict( const Capability & capability ); + void removeExtraConflict( const Capability & capability ); - void removeQueueItem (const SolverQueueItem_Ptr item); - void addQueueItem (const SolverQueueItem_Ptr item); + void removeQueueItem( SolverQueueItem_Ptr item ); + void addQueueItem( SolverQueueItem_Ptr item ); - const CapabilitySet extraRequires () { return _extra_requires; } - const CapabilitySet extraConflicts () { return _extra_conflicts; } + CapabilitySet extraRequires() { return _extra_requires; } + CapabilitySet extraConflicts() { return _extra_conflicts; } - void addWeak (const PoolItem item); + void addWeak( const PoolItem & item ); - void setForceResolve (const bool force) { _forceResolve = force; } - bool forceResolve() { return _forceResolve; } - - void setIgnorealreadyrecommended (const bool ignorealreadyrecommended) - { _ignorealreadyrecommended = ignorealreadyrecommended; } - bool ignorealreadyrecommended() { return _ignorealreadyrecommended; } - - void setOnlyRequires (const TriBool state) - { _onlyRequires = state; } - TriBool onlyRequires () { return _onlyRequires; } - - bool verifySystem (); + bool verifySystem(); bool resolvePool(); - bool resolveQueue(solver::detail::SolverQueueItemList & queue); + bool resolveQueue( SolverQueueItemList & queue ); void doUpdate(); bool doUpgrade( zypp::UpgradeStatistics & opt_stats_r ); - PoolItemList problematicUpdateItems( void ) const; + PoolItemList problematicUpdateItems() const; + + /** \name Solver flags */ + //@{ + bool ignoreAlreadyRecommended() const { return _ignoreAlreadyRecommended; } + void setIgnoreAlreadyRecommended( bool yesno_r ) { _ignoreAlreadyRecommended = yesno_r; } + + bool onlyRequires () const { return _onlyRequires; } + void setOnlyRequires( TriBool state_r ); - bool isUpgradeMode() const { return _upgradeMode;};// Resolver has been called with doUpgrade - bool isUpdateMode() const { return _updateMode;}; // Resolver has been called with doUpdate - bool isVerifyingMode() const { return _verifying;}; // The system will be checked - void setVerifyingMode( TriBool state_r ) { _verifying = ( state_r == indeterminate ) ? false : bool(state_r); } + bool forceResolve() const { return _forceResolve; } + void setForceResolve( TriBool state_r ) { _forceResolve = indeterminate(state_r) ? false : bool(state_r); } + + bool isUpgradeMode() const { return _upgradeMode; }// Resolver has been called with doUpgrade + + bool isUpdateMode() const { return _updateMode; } // Resolver has been called with doUpdate + + bool isVerifyingMode() const { return _verifying; } // The system will be checked + void setVerifyingMode( TriBool state_r ) { _verifying = indeterminate(state_r) ? false : bool(state_r); } + + bool allowVendorChange() const { return _allowVendorChange; } + void setAllowVendorChange( TriBool state_r ); bool solveSrcPackages() const { return _solveSrcPackages; } - void setSolveSrcPackages( TriBool state_r ) { _solveSrcPackages = ( state_r == indeterminate ) ? false : bool(state_r); } + void setSolveSrcPackages( TriBool state_r ) { _solveSrcPackages = indeterminate(state_r) ? false : bool(state_r); } + //@} - ResolverProblemList problems () const; - void applySolutions (const ProblemSolutionList &solutions); + ResolverProblemList problems() const; + void applySolutions( const ProblemSolutionList & solutions ); // reset all SOLVER transaction in pool - void undo(void); - - void reset (bool keepExtras = false ); + void undo(); - bool testing(void) const { return _testing; } - void setTesting( bool testing ) { _testing = testing; } + void reset( bool keepExtras = false ); // Get more information about the solverrun // Which item will be installed by another item or triggers an item for // installation - const ItemCapKindList isInstalledBy (const PoolItem item); - const ItemCapKindList installs (const PoolItem item); - const ItemCapKindList satifiedByInstalled (const PoolItem item); - const ItemCapKindList installedSatisfied (const PoolItem item); + ItemCapKindList isInstalledBy( const PoolItem & item ); + ItemCapKindList installs( const PoolItem & item ); + ItemCapKindList satifiedByInstalled (const PoolItem & item ); + ItemCapKindList installedSatisfied( const PoolItem & item ); }; diff --git a/zypp/solver/detail/Testcase.cc b/zypp/solver/detail/Testcase.cc index e57c174..ab2607a 100644 --- a/zypp/solver/detail/Testcase.cc +++ b/zypp/solver/detail/Testcase.cc @@ -352,7 +352,7 @@ bool Testcase::createTestcase(Resolver & resolver, bool dumpPool, bool runSolver "solver-system.xml.gz", resolver.forceResolve(), resolver.onlyRequires(), - resolver.ignorealreadyrecommended() ); + resolver.ignoreAlreadyRecommended() ); for (PoolItemList::const_iterator iter = items_to_install.begin(); iter != items_to_install.end(); iter++) { control.installResolvable (iter->resolvable(), iter->status()); @@ -450,7 +450,7 @@ HelixControl::HelixControl(const std::string & controlPath, *file << TAB << "<channel file=\"" << str::numstring((long)it->first.id()) << "-package.xml.gz\" name=\"" << repo.alias() << "\"" - << " priority=\"" << repo.priority() + << " priority=\"" << repo.priority() << "\" />" << endl << endl; } for (LocaleSet::const_iterator iter = languages.begin(); iter != languages.end(); iter++) { @@ -465,7 +465,7 @@ HelixControl::HelixControl(const std::string & controlPath, if (ignorealreadyrecommended) *file << TAB << "<ignorealreadyrecommended/>" << endl; - + *file << "</setup>" << endl << "<trial>" << endl; } -- 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] <libzypp> master : New solver.allowVendorChange option in zypp.conf
by Michael Andres 27 May '09

27 May '09

ref: refs/heads/master commit e9f3bf7b97fe452bbddb0975e77908f42756e55f Author: Michael Andres <ma(a)suse.de> Date: Wed May 27 13:50:16 2009 +0200 New solver.allowVendorChange option in zypp.conf --- zypp.conf | 14 ++++++++++++++ zypp/ZConfig.cc | 19 ++++++++++++------- zypp/ZConfig.h | 5 +++++ 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/zypp.conf b/zypp.conf index f50ce90..e1c8920 100644 --- a/zypp.conf +++ b/zypp.conf @@ -228,6 +228,20 @@ # solver.onlyRequires = false ## +## EXPERTS ONLY: Per default the solver will not replace packages of +## different vendors, unless you explicitly ask to do so. Setting this +## option to TRUE will disable this vendor check (unless the application +## explicitly re-enables it). Packages will then be considered based on +## repository priority and version only. This may easily damage your system. +## +## CHANGING THE DEFAULT IS NOT RECOMMENDED. +## +## Valid values: boolean +## Default value: false +## +# solver.allowVendorChange = false + +## ## This file contains requirements/conflicts which fulfill the ## needs of a running system. ## For example the system would be broken if not glibc or kernel is diff --git a/zypp/ZConfig.cc b/zypp/ZConfig.cc index ceab33f..7e17ad0 100644 --- a/zypp/ZConfig.cc +++ b/zypp/ZConfig.cc @@ -208,7 +208,6 @@ namespace zypp , download_min_download_speed(0) , download_max_download_speed(0) , download_max_silent_tries(5) - , solver_onlyRequires ( false ) , apply_locks_file ( true ) { @@ -329,7 +328,11 @@ namespace zypp } else if ( entry == "solver.onlyRequires" ) { - solver_onlyRequires = str::strToBool( value, solver_onlyRequires ); + solver_onlyRequires.set( str::strToBool( value, solver_onlyRequires.get() ) ); + } + else if ( entry == "solver.allowVendorChange" ) + { + solver_allowVendorChange.set( str::strToBool( value, solver_allowVendorChange.get() ) ); } else if ( entry == "solver.checkSystemFile" ) { @@ -441,7 +444,8 @@ namespace zypp int download_max_download_speed; int download_max_silent_tries; - bool solver_onlyRequires; + Option<bool,false> solver_onlyRequires; + Option<bool,false> solver_allowVendorChange; Pathname solver_checkSystemFile; std::set<IdString> multiversion; @@ -646,7 +650,10 @@ namespace zypp { return _pimpl->download_max_silent_tries; } bool ZConfig::solver_onlyRequires() const - { return _pimpl->solver_onlyRequires; } + { return _pimpl->solver_onlyRequires.get(); } + + bool ZConfig::solver_allowVendorChange() const + { return _pimpl->solver_allowVendorChange.get(); } Pathname ZConfig::solver_checkSystemFile() const { return ( _pimpl->solver_checkSystemFile.empty() @@ -662,9 +669,7 @@ namespace zypp { return _pimpl->multiversion.erase(IdString(name)); } bool ZConfig::apply_locks_file() const - { - return _pimpl->apply_locks_file; - } + { return _pimpl->apply_locks_file; } Pathname ZConfig::update_dataPath() const { diff --git a/zypp/ZConfig.h b/zypp/ZConfig.h index 42f602e..6d66838 100644 --- a/zypp/ZConfig.h +++ b/zypp/ZConfig.h @@ -229,6 +229,11 @@ namespace zypp Pathname solver_checkSystemFile() const; /** + * Whether vendor check is by default enabled. + */ + bool solver_allowVendorChange() const; + + /** * Packages which can be installed parallel with different versions * Returning a set of package names (IdString) */ -- 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] <libzypp> master : Decrease severity of unknown 'namespace callback' log message (bnc #484751)
by Michael Andres 27 May '09

27 May '09

ref: refs/heads/master commit de231c3517a44300fd13c6b0f91a2661914d3a13 Author: Michael Andres <ma(a)suse.de> Date: Wed May 27 10:48:00 2009 +0200 Decrease severity of unknown 'namespace callback' log message (bnc #484751) --- zypp/sat/detail/PoolImpl.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zypp/sat/detail/PoolImpl.cc b/zypp/sat/detail/PoolImpl.cc index 38e093c..bddf9f8 100644 --- a/zypp/sat/detail/PoolImpl.cc +++ b/zypp/sat/detail/PoolImpl.cc @@ -142,7 +142,7 @@ namespace zypp break; } - INT << "Unhandled " << Capability( lhs ) << " vs. " << Capability( rhs ) << endl; + WAR << "Unhandled " << Capability( lhs ) << " vs. " << Capability( rhs ) << endl; return RET_unsupported; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0