June 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <libzypp> master : Show the individual attributes that lead to a match.
by Michael Andres 25 Jun '09

25 Jun '09

ref: refs/heads/master commit 4cb1659c019830b8d4ffea0f4fd501343b40e94b Author: Michael Andres <ma(a)suse.de> Date: Thu Jun 25 16:50:41 2009 +0200 Show the individual attributes that lead to a match. --- tools/NameReqPrv.cc | 44 ++++++++++++++++++-------------------------- 1 files changed, 18 insertions(+), 26 deletions(-) diff --git a/tools/NameReqPrv.cc b/tools/NameReqPrv.cc index f21f8af..3329ba2 100644 --- a/tools/NameReqPrv.cc +++ b/tools/NameReqPrv.cc @@ -6,18 +6,14 @@ static std::string appname( "NameReqPrv" ); -void message( const std::string & msg_r ) -{ - cerr << "*** " << msg_r << endl; -} +#define message cerr +using std::flush; int errexit( const std::string & msg_r = std::string(), int exit_r = 100 ) { if ( ! msg_r.empty() ) { - cerr << endl; - message( msg_r ); - cerr << endl; + cerr << endl << msg_r << endl << endl; } return exit_r; } @@ -26,9 +22,7 @@ int usage( const std::string & msg_r = std::string(), int exit_r = 100 ) { if ( ! msg_r.empty() ) { - cerr << endl; - message( msg_r ); - cerr << endl; + cerr << endl << msg_r << endl << endl; } cerr << "Usage: " << appname << " [--root ROOTDIR] [OPTIONS] NAME... [[OPTIONS] NAME...]..." << endl; cerr << " Load all enabled repositories (no refresh) and search for" << endl; @@ -67,6 +61,7 @@ int main( int argc, char * argv[] ) ZConfig::instance(); Pathname sysRoot("/"); + sat::Pool satpool( sat::Pool::instance() ); if ( (*argv) == std::string("--root") ) { @@ -83,25 +78,26 @@ int main( int argc, char * argv[] ) if ( TestSetup::isTestcase( sysRoot ) ) { - message( str::form( "*** Load Testcase from '%s'", sysRoot.c_str() ) ); + message << str::form( "*** Load Testcase from '%s'", sysRoot.c_str() ) << endl; TestSetup test; test.loadTestcaseRepos( sysRoot ); } else if ( TestSetup::isTestSetup( sysRoot ) ) { - message( str::form( "*** Load TestSetup from '%s'", sysRoot.c_str() ) ); + message << str::form( "*** Load TestSetup from '%s'", sysRoot.c_str() ) << endl; TestSetup test( sysRoot ); test.loadRepos(); } else { // a system - message( str::form( "*** Load system at '%s'", sysRoot.c_str() ) ); + message << str::form( "*** Load system at '%s'", sysRoot.c_str() ) << endl; if ( 1 ) { - message( "*** load target" ); + message << "*** load target '" << Repository::systemRepoAlias() << "'\t" << endl; getZYpp()->initializeTarget( sysRoot ); getZYpp()->target()->load(); + message << satpool.systemRepo() << endl; } if ( 1 ) @@ -117,27 +113,26 @@ int main( int argc, char * argv[] ) if ( ! repoManager.isCached( nrepo ) ) { - message( str::form( "*** omit uncached repo '%s' (do 'zypper refresh')", nrepo.name().c_str() ) ); + message << str::form( "*** omit uncached repo '%s' (do 'zypper refresh')", nrepo.name().c_str() ) << endl; continue; } - message( str::form( "*** load repo '%s'", nrepo.name().c_str() ) ); + message << str::form( "*** load repo '%s'\t", nrepo.name().c_str() ) << flush; try { repoManager.loadFromCache( nrepo ); + message << satpool.reposFind( nrepo.alias() ) << endl; } catch ( const Exception & exp ) { - message( exp.asString() + "\n" + exp.historyAsString() ); - message( str::form( "*** omit broken repo '%s' (do 'zypper refresh')", nrepo.name().c_str() ) ); + message << exp.asString() + "\n" + exp.historyAsString() << endl; + message << str::form( "*** omit broken repo '%s' (do 'zypper refresh')", nrepo.name().c_str() ) << endl; continue; } } } } - sat::Pool satpool( sat::Pool::instance() ); - dumpRange( cerr, satpool.reposBegin(), satpool.reposEnd() ) << endl; /////////////////////////////////////////////////////////////////// bool ignorecase( true ); @@ -177,17 +172,14 @@ int main( int argc, char * argv[] ) if ( requires ) q.addDependency( sat::SolvAttr::requires ); -// q.begin(); -// cerr << q << endl; - - cerr << *argv << " [" << (ignorecase?'i':'_') << (names?'n':'_') << (requires?'r':'_') << (provides?'p':'_') << "] {" << endl; + message << *argv << " [" << (ignorecase?'i':'_') << (names?'n':'_') << (requires?'r':'_') << (provides?'p':'_') << "] {" << endl; for_( it, q.begin(), q.end() ) { - cerr << " " << it << endl; + message << " " << dump(it) << endl; } - cerr << "}" << endl; + message << "}" << endl; } INT << "===[END]============================================" << endl << 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 : Enhance PoolQueryIterator to allow detailed inspection attribute matches.
by Michael Andres 25 Jun '09

25 Jun '09

ref: refs/heads/master commit 1184bb3499ef3e6942ad6026f9d9135726e97521 Author: Michael Andres <ma(a)suse.de> Date: Thu Jun 25 16:17:26 2009 +0200 Enhance PoolQueryIterator to allow detailed inspection attribute matches. --- zypp/PoolQuery.cc | 99 ++++++++++++++++++++++++++++++++++++++++++++---- zypp/PoolQuery.h | 77 ++++++++++++++++++++++++++++++++++++- zypp/sat/LookupAttr.cc | 6 +++ zypp/sat/LookupAttr.h | 8 +++- 4 files changed, 178 insertions(+), 12 deletions(-) diff --git a/zypp/PoolQuery.cc b/zypp/PoolQuery.cc index 375a349..79f5ee6 100644 --- a/zypp/PoolQuery.cc +++ b/zypp/PoolQuery.cc @@ -1217,21 +1217,71 @@ attremptycheckend: if ( base_r == end() ) base_r = startNewQyery(); // first candidate else + { + base_r.nextSkipSolvable(); // assert we don't visit this Solvable again ++base_r; // advance to next candidate + } while ( base_r != end() ) { if ( isAMatch( base_r ) ) - { - base_r.nextSkipSolvable(); // assert we don't visit this Solvable again return true; - } // No match: try next - ++base_r; + ++base_r; } return false; } + /** Provide all matching attributes within this solvable. + * + */ + void matchDetail( const base_iterator & base_r, std::vector<base_iterator> & return_r ) const + { + if ( base_r == end() ) + return; + + sat::Solvable inSolvable( base_r.inSolvable() ); + + if ( _attrMatchList.size() == 1 ) + { + // base_r is already on the 1st matching attribute! + // String matching is done by the base iterator. We must check the predicate here. + // Let's see if there are more matches for this solvable: + base_iterator base( base_r ); + base.stayInThisSolvable(); // avoid discarding matches we found far away from here. + return_r.push_back( base ); + + const AttrMatchData::Predicate & predicate( _attrMatchList.front().predicate ); + for ( ++base; base.inSolvable() == inSolvable; ++base ) // safe even if base == end() + { + if ( ! predicate || predicate( base ) ) + return_r.push_back( base ); + } + } + else + { + // Here: search all attributes ;( + for_( mi, _attrMatchList.begin(), _attrMatchList.end() ) + { + const AttrMatchData & matchData( *mi ); + sat::LookupAttr q( matchData.attr, inSolvable ); + if ( matchData.attrMatcher ) // an empty searchstring matches always + q.setAttrMatcher( matchData.attrMatcher ); + + if ( ! q.empty() ) // there are matches. + { + // now check any predicate: + const AttrMatchData::Predicate & predicate( matchData.predicate ); + for_( it, q.begin(), q.end() ) + { + if ( ! predicate || predicate( it ) ) + return_r.push_back( it ); + } + } + } + } + } + public: /** Ctor stores the \ref PoolQuery settings. * \throw MatchException Any of the exceptions thrown by \ref PoolQuery::Impl::compile. @@ -1344,8 +1394,7 @@ attremptycheckend: if ( ! predicate || predicate( base_r ) ) return true; - base_r.nextSkipSolvable(); - return false; + return false; // no skip as there may be more occurrences od this attr. } // Here: search all attributes ;( @@ -1396,8 +1445,42 @@ attremptycheckend: // matcher restarts if at end! It is called from the ctor // to get the 1st match. But if the end is reached, it should // be deleted, otherwise we'd start over again. - if ( _matcher && ! _matcher->advance( base_reference() ) ) - _matcher.reset(); + if ( !_matcher ) + return; // at end + if ( _matches ) + _matches.reset(); // invalidate old matches + if ( ! _matcher->advance( base_reference() ) ) + _matcher.reset(); + } + + const PoolQueryIterator::Matches & PoolQueryIterator::matches() const + { + if ( _matches ) + return *_matches; + + if ( !_matcher ) + { + // at end of query: + static const Matches _none; + return _none; + } + + _matches.reset( new Matches ); + _matcher->matchDetail( base_reference(), *_matches ); + return *_matches; + } + + std::ostream & dumpOn( std::ostream & str, const PoolQueryIterator & obj ) + { + str << *obj; + if ( ! obj.matchesEmpty() ) + { + for_( it, obj.matchesBegin(), obj.matchesEnd() ) + { + str << endl << " " << it->inSolvAttr() << "\t" << it->asString(); + } + } + return str; } /////////////////////////////////////////////////////////////////// diff --git a/zypp/PoolQuery.h b/zypp/PoolQuery.h index 032650c..4238155 100644 --- a/zypp/PoolQuery.h +++ b/zypp/PoolQuery.h @@ -77,6 +77,7 @@ namespace zypp * on kinds, multiple repos, and multiple attributes are filtered inside * the PoolQuery, so these tend to be slower. * + * \see detail::PoolQueryIterator on how to inspect matches in detail. * \see tests/zypp/PoolQuery_test.cc for more examples * \see sat::SolvIterMixin */ @@ -463,7 +464,6 @@ namespace zypp /** \relates PoolQuery Stream output. */ std::ostream & operator<<( std::ostream & str, const PoolQuery & obj ); - /////////////////////////////////////////////////////////////////// namespace detail { ///////////////////////////////////////////////////////////////// @@ -475,7 +475,12 @@ namespace zypp // CLASS NAME : PoolQuery::PoolQueryIterator // /** \ref PoolQuery iterator as returned by \ref PoolQuery::begin. - */ + * + * The \ref PoolQueryIterator visits sat::Solavables that do contain matches. + * + * But it also provides an iterator by itself, to allow a detailed inspection of + * the individual attribute matches within the current Solvable. + */ class PoolQueryIterator : public boost::iterator_adaptor< PoolQueryIterator // Derived , sat::LookupAttr::iterator // Base @@ -484,6 +489,10 @@ namespace zypp , const sat::Solvable // Reference > { + typedef std::vector<sat::LookupAttr::iterator> Matches; + public: + typedef Matches::size_type size_type; + typedef Matches::const_iterator matches_iterator; public: /** Default ctor is also \c end.*/ PoolQueryIterator() @@ -494,6 +503,61 @@ namespace zypp : _matcher( matcher_r ) { increment(); } + /** \name Detailed inspection of attribute matches within the current Solvable. + * + * The \ref matches_iterator visits all attribute matches within the current Solvable, + * providing a \ref sat::LookupAttr::iterator pointing to attribute. While a + * \ref matches_iterator itself becomes invalid if the PoolQueryIterator is advanced, + * the \ref sat::LookupAttr::iterator it pointed to stays valid, even after the query + * ended. + * + * \code + * // Setup query for "libzypp" in name or requires: + * PoolQuery q; + * q.addString( "libzypp" ); + * q.setMatchSubstring(); + * q.setCaseSensitive( false ); + * q.addAttribute( sat::SolvAttr::name ); + * q.addDependency( sat::SolvAttr::requires ); + * + * // Iterate the result: + * for_( solvIter, q.begin(), q.end() ) + * { + * sat::Solvable solvable( *solvIter ); + * cout << "Found matches in " << solvable << endl; + * if ( verbose ) + * for_( attrIter, solvIter.matchesBegin(), solvIter.matchesEnd() ) + * { + * sat::LookupAttr::iterator attr( *attrIter ); + * cout << " " << attr.inSolvAttr() << "\t\"" << attr.asString() << "\"" << endl; + * } + * } + * + * + * Found matches in PackageKit-0.3.11-1.12.i586(@System) + * solvable:requires "libzypp.so.523" + * Found matches in libqdialogsolver1-1.2.6-1.1.2.i586(@System) + * solvable:requires "libzypp.so.523" + * solvable:requires "libzypp >= 5.25.3-0.1.2" + * Found matches in libzypp-5.30.3-0.1.1.i586(@System) + * solvable:name "libzypp" + * Found matches in libzypp-testsuite-tools-4.2.6-8.1.i586(@System) + * solvable:name "libzypp-testsuite-tools" + * solvable:requires "libzypp.so.523" + * ... + * \endcode + */ + //@{ + /** \c False unless this is the \c end iterator. */ + bool matchesEmpty() const { return ! _matcher; } + /** Number of attribute matches. */ + size_type matchesSize() const { return matches().size(); } + /** Begin of matches. */ + matches_iterator matchesBegin() const { return matches().begin(); } + /** End of matches. */ + matches_iterator matchesEnd() const { return matches().end(); } + //@} + private: friend class boost::iterator_core_access; @@ -502,8 +566,12 @@ namespace zypp void increment(); - private: + private: + const Matches & matches() const; + + private: shared_ptr<PoolQueryMatcher> _matcher; + mutable shared_ptr<Matches> _matches; }; /////////////////////////////////////////////////////////////////// @@ -511,6 +579,9 @@ namespace zypp inline std::ostream & operator<<( std::ostream & str, const PoolQueryIterator & obj ) { return str << obj.base(); } + /** \relates PoolQueryIterator Detailed stream output. */ + std::ostream & dumpOn( std::ostream & str, const PoolQueryIterator & obj ); + /////////////////////////////////////////////////////////////////// } //namespace detail /////////////////////////////////////////////////////////////////// diff --git a/zypp/sat/LookupAttr.cc b/zypp/sat/LookupAttr.cc index cd8cada..f184502 100644 --- a/zypp/sat/LookupAttr.cc +++ b/zypp/sat/LookupAttr.cc @@ -350,6 +350,12 @@ namespace zypp void LookupAttr::iterator::nextSkipRepo() { if ( _dip ) ::dataiterator_skip_repo( _dip.get() ); } + void LookupAttr::iterator::stayInThisSolvable() + { if ( _dip ) { _dip.get()->repoid = -1; _dip.get()->flags |= SEARCH_THISSOLVID; } } + + void LookupAttr::iterator::stayInThisRepo() + { if ( _dip ) { _dip.get()->repoid = -1; } } + /////////////////////////////////////////////////////////////////// // attr value type test /////////////////////////////////////////////////////////////////// diff --git a/zypp/sat/LookupAttr.h b/zypp/sat/LookupAttr.h index 34a3ecd..3152b11 100644 --- a/zypp/sat/LookupAttr.h +++ b/zypp/sat/LookupAttr.h @@ -214,7 +214,7 @@ namespace zypp // // CLASS NAME : LookupRepoAttr // - /** Lightweight repositor attribute value lookup. + /** Lightweight repository attribute value lookup. * * This is just a convenience class that overloads all * \ref LookupAttr methods which take a \ref LookupAttr::Location @@ -357,6 +357,12 @@ namespace zypp /** Immediately advance to the next \ref Repository. */ void skipRepo() { nextSkipRepo(); increment(); } + + /** Stop after all matches in the current \ref Solvable are processed. */ + void stayInThisSolvable(); + + /** Stop after all matches in the current \ref Repository are processed. */ + void stayInThisRepo(); //@} /** \name Current position info. */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : Add Repository::name as we also provide Repository::alias
by Michael Andres 25 Jun '09

25 Jun '09

ref: refs/heads/master commit 2dc507ffbe7598da605a4e832d9d1b37e22282f7 Author: Michael Andres <ma(a)suse.de> Date: Thu Jun 25 14:07:32 2009 +0200 Add Repository::name as we also provide Repository::alias --- zypp/Repository.cc | 3 +++ zypp/Repository.h | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/zypp/Repository.cc b/zypp/Repository.cc index 7294e40..a72bce6 100644 --- a/zypp/Repository.cc +++ b/zypp/Repository.cc @@ -61,6 +61,9 @@ namespace zypp return _repo->name; } + std::string Repository::name() const + { return info().name(); } + zypp::Date Repository::generatedTimestamp() const { NO_REPOSITORY_RETURN( 0 ); diff --git a/zypp/Repository.h b/zypp/Repository.h index 1be3f4f..5976c8e 100644 --- a/zypp/Repository.h +++ b/zypp/Repository.h @@ -70,16 +70,19 @@ namespace zypp public: /** - * Short unique, convenience string to refer to a repo. + * Short unique string to identify a repo. * ie: openSUSE-10.3 * * If you are looking for a label to display - * see \ref info() which provides \ref RepoInfo::name() + * see \ref name(). * ie: "openSUSE 10.3 Main repository" * */ std::string alias() const; + /** Label to display for this repo. */ + std::string name() const; + /** * Timestamp when this repository was generated * -- 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 : - add some fedora specific code
by Michael Schroeder 24 Jun '09

24 Jun '09

ref: refs/heads/master commit abae81bf89fb6d5a2f8f91755c81071c7ae666d5 Author: Michael Schroeder <mls(a)suse.de> Date: Wed Jun 24 18:29:43 2009 +0200 - add some fedora specific code --- examples/solv.c | 42 ++++++++++++++++++++++++++++-------------- 1 files changed, 28 insertions(+), 14 deletions(-) diff --git a/examples/solv.c b/examples/solv.c index ed5622b..89253d1 100644 --- a/examples/solv.c +++ b/examples/solv.c @@ -40,8 +40,13 @@ #include "pool_fileconflicts.h" -#define ZYPP_REPOINFO_PATH "/etc/zypp/repos.d" -#define ZYPP_PRODUCTS_PATH "/etc/products.d" +#ifdef FEDORA +# define REPOINFO_PATH "/etc/yum.repos.d" +#else +# define REPOINFO_PATH "/etc/zypp/repos.d" +# define PRODUCTS_PATH "/etc/products.d" +#endif + struct repoinfo { Repo *repo; @@ -53,13 +58,15 @@ struct repoinfo { char *baseurl; char *path; int type; + int gpgcheck; int priority; int keeppackages; }; -#define TYPE_UNKNOWN 0 -#define TYPE_SUSETAGS 1 -#define TYPE_RPMMD 2 +#define TYPE_UNKNOWN 0 +#define TYPE_SUSETAGS 1 +#define TYPE_RPMMD 2 +#define TYPE_PLAINDIR 3 struct repoinfo * read_repoinfos(Pool *pool, const char *reposdir, int *nrepoinfosp) @@ -116,6 +123,8 @@ read_repoinfos(Pool *pool, const char *reposdir, int *nrepoinfosp) cinfo = repoinfos + nrepoinfos++; memset(cinfo, 0, sizeof(*cinfo)); cinfo->alias = strdup(kp + 1); + cinfo->gpgcheck = 1; + cinfo->type = TYPE_RPMMD; continue; } vp = strchr(kp, '='); @@ -136,6 +145,8 @@ read_repoinfos(Pool *pool, const char *reposdir, int *nrepoinfosp) cinfo->enabled = *vp == '0' ? 0 : 1; else if (!strcmp(kp, "autorefresh")) cinfo->autorefresh = *vp == '0' ? 0 : 1; + else if (!strcmp(kp, "gpgcheck")) + cinfo->gpgcheck = *vp == '0' ? 0 : 1; else if (!strcmp(kp, "baseurl")) cinfo->baseurl = strdup(vp); else if (!strcmp(kp, "path")) @@ -146,6 +157,8 @@ read_repoinfos(Pool *pool, const char *reposdir, int *nrepoinfosp) cinfo->type = TYPE_SUSETAGS; else if (!strcmp(vp, "rpm-md")) cinfo->type = TYPE_RPMMD; + else if (!strcmp(vp, "plaindir")) + cinfo->type = TYPE_PLAINDIR; else cinfo->type = TYPE_UNKNOWN; } @@ -288,7 +301,9 @@ read_repos(Pool *pool, struct repoinfo *repoinfos, int nrepoinfos) printf("reading rpm database\n"); repo = repo_create(pool, "@System"); - repo_add_products(repo, ZYPP_PRODUCTS_PATH, 0, REPO_NO_INTERNALIZE); +#ifdef PRODUCTS_PATH + repo_add_products(repo, PRODUCTS_PATH, 0, REPO_NO_INTERNALIZE); +#endif repo_add_rpmdb(repo, 0, 0, REPO_REUSE_REPODATA); pool_set_installed(pool, repo); @@ -592,7 +607,7 @@ main(int argc, char **argv) pool->nscallback = nscallback; // pool_setdebuglevel(pool, 2); setarch(pool); - repoinfos = read_repoinfos(pool, ZYPP_REPOINFO_PATH, &nrepoinfos); + repoinfos = read_repoinfos(pool, REPOINFO_PATH, &nrepoinfos); read_repos(pool, repoinfos, nrepoinfos); // FOR_REPOS(i, repo) // printf("%s: %d solvables\n", repo->name, repo->nsolvables); @@ -606,7 +621,7 @@ main(int argc, char **argv) updateall = 1; else if (!job.count) { - printf("nothing matched\n"); + printf("no package matched\n"); exit(1); } @@ -786,8 +801,7 @@ rerunsolver: transaction_order(trans, 0); for (i = 0; i < trans->steps.count; i++) { - char rpmname[256]; - const char *evr, *evrp; + const char *evr, *evrp, *nvra; Solvable *s; int j; FILE *fp; @@ -801,15 +815,15 @@ rerunsolver: printf("erase %s\n", solvid2str(pool, p)); if (!s->repo->rpmdbid || !s->repo->rpmdbid[p - s->repo->start]) continue; - if (strlen(solvid2str(pool, p)) > 255) - continue; + /* strip epoch from evr */ evr = evrp = id2str(pool, s->evr); while (*evrp >= '0' && *evrp <= '9') evrp++; if (evrp > evr && evrp[0] == ':' && evrp[1]) evr = evrp + 1; - sprintf(rpmname, "%s-%s.%s", id2str(pool, s->name), evr, id2str(pool, s->arch)); - runrpm("-e", rpmname, -1); + nvra = pool_tmpjoin(pool, id2str(pool, s->name), "-", evr); + nvra = pool_tmpjoin(pool, nvra, ".", id2str(pool, s->arch)); + runrpm("-e", nvra, -1); /* to bad that --querybynumber doesn't work */ break; case SOLVER_TRANSACTION_INSTALL: case SOLVER_TRANSACTION_MULTIINSTALL: -- 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 typos
by Michael Schroeder 24 Jun '09

24 Jun '09

ref: refs/heads/master commit 42686cfb3f4dd8206dc4657960c3a837edc2569d Author: Michael Schroeder <mls(a)suse.de> Date: Wed Jun 24 17:14:51 2009 +0200 - fix typos --- examples/solv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/solv.c b/examples/solv.c index 35a8637..ed5622b 100644 --- a/examples/solv.c +++ b/examples/solv.c @@ -654,7 +654,7 @@ rerunsolver: solver_printprobleminfo(solv, problem); printf("\n"); scnt = solver_solution_count(solv, problem); - for (solution = 1; solution <= pcnt; solution++) + for (solution = 1; solution <= scnt; solution++) { printf("Solution %d:\n", solution); solver_printsolution(solv, problem, solution); @@ -675,7 +675,7 @@ rerunsolver: if (*ip >= '0' && *ip <= '9') { take = atoi(ip); - if (take >= 1 && take <= solution) + if (take >= 1 && take <= scnt) break; } if (*ip == 's') -- 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 : - oops, forgot to set the repo priorities
by Michael Schroeder 24 Jun '09

24 Jun '09

ref: refs/heads/master commit eb8cba5e16f9287fdffa055f53edbc005acd414a Author: Michael Schroeder <mls(a)suse.de> Date: Wed Jun 24 16:22:25 2009 +0200 - oops, forgot to set the repo priorities --- examples/solv.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/examples/solv.c b/examples/solv.c index 3b3c19b..35a8637 100644 --- a/examples/solv.c +++ b/examples/solv.c @@ -306,6 +306,7 @@ read_repos(Pool *pool, struct repoinfo *repoinfos, int nrepoinfos) repo = repo_create(pool, cinfo->alias); cinfo->repo = repo; repo->appdata = cinfo; + repo->priority = 99 - cinfo->priority; repo_add_repomdxml(repo, fp, 0); fclose(fp); primaryfile = 0; @@ -329,6 +330,7 @@ read_repos(Pool *pool, struct repoinfo *repoinfos, int nrepoinfos) repo = repo_create(pool, cinfo->alias); cinfo->repo = repo; repo->appdata = cinfo; + repo->priority = 99 - cinfo->priority; descrdir = 0; defvendor = 0; if ((fp = curlfopen(cinfo->baseurl, "content", 0)) != 0) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <sat-solver> master : - fix bug in take_solution
by Michael Schroeder 24 Jun '09

24 Jun '09

ref: refs/heads/master commit 61d057c6dd7c3d76b5334ff0ffb53254d9e57a4d Author: Michael Schroeder <mls(a)suse.de> Date: Wed Jun 24 16:16:29 2009 +0200 - fix bug in take_solution - add buddy callback support --- examples/solv.c | 41 +++++++++++++++++++++++++++++++++++++++-- src/problems.c | 2 +- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/examples/solv.c b/examples/solv.c index 96dd40b..3b3c19b 100644 --- a/examples/solv.c +++ b/examples/solv.c @@ -487,6 +487,8 @@ fc_cb(Pool *pool, Id p, void *cbdata) if (i == fcstate->newpkgscnt) return 0; fp = fcstate->newpkgsfps[i]; + if (!fp) + return 0; rewind(fp); return rpm_byfp(fp, solvable2str(pool, s), &fcstate->rpmdbstate); } @@ -527,6 +529,33 @@ runrpm(const char *arg, const char *name, int dupfd3) } } +static Id +nscallback(Pool *pool, void *data, Id name, Id evr) +{ + if (name == NAMESPACE_PRODUCTBUDDY) + { + /* SUSE specific hack: each product has an associated rpm */ + Solvable *s = pool->solvables + evr; + Id p, pp, cap; + + cap = str2id(pool, pool_tmpjoin(pool, "product(", id2str(pool, s->name) + 8, ")"), 0); + if (!cap) + return 0; + cap = rel2id(pool, cap, s->evr, REL_EQ, 0); + if (!cap) + return 0; + FOR_PROVIDES(p, pp, cap) + { + Solvable *ps = pool->solvables + p; + if (ps->repo == s->repo && ps->arch == s->arch) + break; + } + return p; + } + return 0; +} + + int main(int argc, char **argv) { @@ -558,6 +587,7 @@ main(int argc, char **argv) } pool = pool_create(); + pool->nscallback = nscallback; // pool_setdebuglevel(pool, 2); setarch(pool); repoinfos = read_repoinfos(pool, ZYPP_REPOINFO_PATH, &nrepoinfos); @@ -703,6 +733,8 @@ rerunsolver: exit(1); } loc = solvable_get_location(s, &medianr); + if (!loc) + continue; if (cinfo->type == TYPE_SUSETAGS) { const char *datadir = repo_lookup_str(cinfo->repo, SOLVID_META, SUSETAGS_DATADIR); @@ -710,7 +742,7 @@ rerunsolver: } if ((newpkgsfps[i] = curlfopen(cinfo->baseurl, loc, 0)) == 0) { - printf("%s: %s not found\n", s->repo->name, loc); + printf("%s: %s not found in repository\n", s->repo->name, loc); exit(1); } } @@ -736,7 +768,8 @@ rerunsolver: if (yesno("Re-run solver (y/n/q)? ")) { for (i = 0; i < newpkgs; i++) - fclose(newpkgsfps[i]); + if (newpkgsfps[i]) + fclose(newpkgsfps[i]); newpkgsfps = sat_free(newpkgsfps); solver_free(solv); pool_add_fileconflicts_deps(pool, &conflicts); @@ -764,6 +797,8 @@ rerunsolver: { case SOLVER_TRANSACTION_ERASE: printf("erase %s\n", solvid2str(pool, p)); + if (!s->repo->rpmdbid || !s->repo->rpmdbid[p - s->repo->start]) + continue; if (strlen(solvid2str(pool, p)) > 255) continue; evr = evrp = id2str(pool, s->evr); @@ -781,6 +816,8 @@ rerunsolver: if (checkq.elements[j] == p) break; fp = j < newpkgs ? newpkgsfps[j] : 0; + if (!fp) + continue; rewind(fp); lseek(fileno(fp), 0, SEEK_SET); runrpm(type == SOLVER_TRANSACTION_MULTIINSTALL ? "-i" : "-U", "/dev/fd/3", fileno(fp)); diff --git a/src/problems.c b/src/problems.c index ccdb54c..d90dfb7 100644 --- a/src/problems.c +++ b/src/problems.c @@ -707,7 +707,7 @@ solver_take_solutionelement(Solver *solv, Id p, Id rp, Queue *job) p = SOLVER_ERASE|SOLVER_SOLVABLE; } for (i = 0; i < job->count; i += 2) - if (job->elements[i] == p && job->elements[i + 2] == rp) + if (job->elements[i] == p && job->elements[i + 1] == rp) return; queue_push2(job, p, rp); } -- 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 : - use descrdir and datadir info from content file
by Michael Schroeder 24 Jun '09

24 Jun '09

ref: refs/heads/master commit 402fa6cdd43ba6e4dc5623bc4b357a47b1e901d2 Author: Michael Schroeder <mls(a)suse.de> Date: Wed Jun 24 15:58:50 2009 +0200 - use descrdir and datadir info from content file --- examples/solv.c | 54 ++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 42 insertions(+), 12 deletions(-) diff --git a/examples/solv.c b/examples/solv.c index 26120f5..96dd40b 100644 --- a/examples/solv.c +++ b/examples/solv.c @@ -32,12 +32,17 @@ #include "solverdebug.h" #include "repo_rpmdb.h" +#include "repo_products.h" #include "repo_rpmmd.h" #include "repo_susetags.h" #include "repo_repomdxml.h" +#include "repo_content.h" #include "pool_fileconflicts.h" +#define ZYPP_REPOINFO_PATH "/etc/zypp/repos.d" +#define ZYPP_PRODUCTS_PATH "/etc/products.d" + struct repoinfo { Repo *repo; @@ -150,13 +155,6 @@ read_repoinfos(Pool *pool, const char *reposdir, int *nrepoinfosp) cinfo->keeppackages = *vp == '0' ? 0 : 1; } fclose(fp); - if (cinfo->type == TYPE_SUSETAGS && cinfo->baseurl) - { - char *old = cinfo->baseurl; - cinfo->baseurl = sat_malloc(5 + strlen(old) + 1); - sprintf(cinfo->baseurl, "%s/suse", old); - free(old); - } cinfo = 0; } closedir(dir); @@ -237,6 +235,12 @@ curlfopen(const char *baseurl, const char *file, int uncompress) } while (waitpid(pid, &status, 0) != pid) ; + if (lseek(fd, 0, SEEK_END) == 0) + { + /* empty file */ + close(fd); + return 0; + } lseek(fd, 0, SEEK_SET); if (uncompress) { @@ -279,10 +283,14 @@ read_repos(Pool *pool, struct repoinfo *repoinfos, int nrepoinfos) FILE *fp; Dataiterator di; const char *primaryfile; + const char *descrdir; + int defvendor; printf("reading rpm database\n"); repo = repo_create(pool, "@System"); - repo_add_rpmdb(repo, 0, 0, 0); + repo_add_products(repo, ZYPP_PRODUCTS_PATH, 0, REPO_NO_INTERNALIZE); + repo_add_rpmdb(repo, 0, 0, REPO_REUSE_REPODATA); + pool_set_installed(pool, repo); for (i = 0; i < nrepoinfos; i++) { @@ -318,12 +326,24 @@ read_repos(Pool *pool, struct repoinfo *repoinfos, int nrepoinfos) break; case TYPE_SUSETAGS: printf("reading susetags repo '%s'\n", cinfo->alias); - if ((fp = curlfopen(cinfo->baseurl, "setup/descr/packages.gz", 1)) == 0) - break; repo = repo_create(pool, cinfo->alias); cinfo->repo = repo; repo->appdata = cinfo; - repo_add_susetags(repo, fp, 0, 0, 0); + descrdir = 0; + defvendor = 0; + if ((fp = curlfopen(cinfo->baseurl, "content", 0)) != 0) + { + repo_add_content(repo, fp, 0); + fclose(fp); + defvendor = repo_lookup_id(repo, SOLVID_META, SUSETAGS_DEFAULTVENDOR); + descrdir = repo_lookup_str(repo, SOLVID_META, SUSETAGS_DESCRDIR); + } + if (!descrdir) + descrdir = "suse/setup/descr"; + if ((fp = curlfopen(cinfo->baseurl, pool_tmpjoin(pool, descrdir, "/packages.gz", 0), 1)) == 0) + if ((fp = curlfopen(cinfo->baseurl, pool_tmpjoin(pool, descrdir, "/packages", 0), 0)) == 0) + break; + repo_add_susetags(repo, fp, defvendor, 0, 0); fclose(fp); break; default: @@ -540,7 +560,7 @@ main(int argc, char **argv) pool = pool_create(); // pool_setdebuglevel(pool, 2); setarch(pool); - repoinfos = read_repoinfos(pool, "/etc/zypp/repos.d", &nrepoinfos); + repoinfos = read_repoinfos(pool, ZYPP_REPOINFO_PATH, &nrepoinfos); read_repos(pool, repoinfos, nrepoinfos); // FOR_REPOS(i, repo) // printf("%s: %d solvables\n", repo->name, repo->nsolvables); @@ -576,6 +596,11 @@ main(int argc, char **argv) for (i = 0; i < job.count; i += 2) job.elements[i] |= mode; + // multiversion test + // queue_push2(&job, SOLVER_NOOBSOLETES|SOLVER_SOLVABLE_NAME, str2id(pool, "kernel-pae", 1)); + // queue_push2(&job, SOLVER_NOOBSOLETES|SOLVER_SOLVABLE_NAME, str2id(pool, "kernel-pae-base", 1)); + // queue_push2(&job, SOLVER_NOOBSOLETES|SOLVER_SOLVABLE_NAME, str2id(pool, "kernel-pae-extra", 1)); + rerunsolver: for (;;) { @@ -678,6 +703,11 @@ rerunsolver: exit(1); } loc = solvable_get_location(s, &medianr); + if (cinfo->type == TYPE_SUSETAGS) + { + const char *datadir = repo_lookup_str(cinfo->repo, SOLVID_META, SUSETAGS_DATADIR); + loc = pool_tmpjoin(pool, datadir ? datadir : "suse", "/", loc); + } if ((newpkgsfps[i] = curlfopen(cinfo->baseurl, loc, 0)) == 0) { printf("%s: %s not found\n", s->repo->name, loc); -- 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 : - fetch primary location from repomd.xml
by Michael Schroeder 24 Jun '09

24 Jun '09

ref: refs/heads/master commit 9b2d6a3712a05ef3da0ab54ab113b4893fdd89b5 Author: Michael Schroeder <mls(a)suse.de> Date: Wed Jun 24 14:06:31 2009 +0200 - fetch primary location from repomd.xml --- examples/solv.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/examples/solv.c b/examples/solv.c index d15a22c..26120f5 100644 --- a/examples/solv.c +++ b/examples/solv.c @@ -198,7 +198,7 @@ myfopen(const char *fn) } FILE * -curlfopen(char *baseurl, char *file, int uncompress) +curlfopen(const char *baseurl, const char *file, int uncompress) { pid_t pid; int fd, l; @@ -269,6 +269,7 @@ setarch(Pool *pool) pool_setarch(pool, un.machine); } + void read_repos(Pool *pool, struct repoinfo *repoinfos, int nrepoinfos) { @@ -276,6 +277,8 @@ read_repos(Pool *pool, struct repoinfo *repoinfos, int nrepoinfos) struct repoinfo *cinfo; int i; FILE *fp; + Dataiterator di; + const char *primaryfile; printf("reading rpm database\n"); repo = repo_create(pool, "@System"); @@ -297,7 +300,18 @@ read_repos(Pool *pool, struct repoinfo *repoinfos, int nrepoinfos) repo->appdata = cinfo; repo_add_repomdxml(repo, fp, 0); fclose(fp); - if ((fp = curlfopen(cinfo->baseurl, "repodata/primary.xml.gz", 1)) == 0) + primaryfile = 0; + dataiterator_init(&di, pool, repo, SOLVID_META, REPOSITORY_REPOMD_TYPE, "primary", SEARCH_STRING); + dataiterator_prepend_keyname(&di, REPOSITORY_REPOMD); + if (dataiterator_step(&di)) + { + dataiterator_setpos_parent(&di); + primaryfile = pool_lookup_str(pool, SOLVID_POS, REPOSITORY_REPOMD_LOCATION); + } + dataiterator_free(&di); + if (!primaryfile) + primaryfile = "repodata/primary.xml.gz"; + if ((fp = curlfopen(cinfo->baseurl, primaryfile, 1)) == 0) continue; repo_add_rpmmd(repo, fp, 0, 0); fclose(fp); -- 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 : - add pool_tmpjoin and sat_dupjoin helpers
by Michael Schroeder 24 Jun '09

24 Jun '09

ref: refs/heads/master commit a0a50d58fc36591062459d03eeb2f271da7bada2 Author: Michael Schroeder <mls(a)suse.de> Date: Wed Jun 24 13:53:30 2009 +0200 - add pool_tmpjoin and sat_dupjoin helpers --- src/pool.c | 29 +++++++++++++++++++++++++++++ src/pool.h | 1 + src/util.c | 28 ++++++++++++++++++++++++++++ src/util.h | 1 + 4 files changed, 59 insertions(+), 0 deletions(-) diff --git a/src/pool.c b/src/pool.c index ec87a4b..9155c2f 100644 --- a/src/pool.c +++ b/src/pool.c @@ -1173,6 +1173,35 @@ pool_alloctmpspace(Pool *pool, int len) return pool->tmpspacebuf[n]; } +char * +pool_tmpjoin(Pool *pool, const char *str1, const char *str2, const char *str3) +{ + int l1, l2, l3; + char *s, *str; + l1 = str1 ? strlen(str1) : 0; + l2 = str2 ? strlen(str2) : 0; + l3 = str3 ? strlen(str3) : 0; + s = str = pool_alloctmpspace(pool, l1 + l2 + l3 + 1); + if (l1) + { + strcpy(s, str1); + s += l1; + } + if (l2) + { + strcpy(s, str2); + s += l2; + } + if (l3) + { + strcpy(s, str3); + s += l3; + } + *s = 0; + return str; +} + + /*******************************************************************/ struct mptree { diff --git a/src/pool.h b/src/pool.h index 47e12cc..3df007b 100644 --- a/src/pool.h +++ b/src/pool.h @@ -176,6 +176,7 @@ extern void pool_free(Pool *pool); extern void pool_debug(Pool *pool, int type, const char *format, ...) __attribute__((format(printf, 3, 4))); extern char *pool_alloctmpspace(Pool *pool, int len); +extern char *pool_tmpjoin(Pool *pool, const char *str1, const char *str2, const char *str3); extern void pool_set_installed(Pool *pool, struct _Repo *repo); diff --git a/src/util.c b/src/util.c index cde01f4..7dea6aa 100644 --- a/src/util.c +++ b/src/util.c @@ -108,3 +108,31 @@ sat_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, cons { qsort_r(base, nmemb, size, compar, compard); } + +char * +sat_dupjoin(const char *str1, const char *str2, const char *str3) +{ + int l1, l2, l3; + char *s, *str; + l1 = str1 ? strlen(str1) : 0; + l2 = str2 ? strlen(str2) : 0; + l3 = str3 ? strlen(str3) : 0; + s = str = sat_malloc(l1 + l2 + l3 + 1); + if (l1) + { + strcpy(s, str1); + s += l1; + } + if (l2) + { + strcpy(s, str2); + s += l2; + } + if (l3) + { + strcpy(s, str3); + s += l3; + } + *s = 0; + return str; +} diff --git a/src/util.h b/src/util.h index e578faf..6191d43 100644 --- a/src/util.h +++ b/src/util.h @@ -29,6 +29,7 @@ extern void *sat_free(void *); extern void sat_oom(size_t, size_t); extern unsigned int sat_timems(unsigned int subtract); extern void sat_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard); +extern char *sat_dupjoin(const char *str1, const char *str2, const char *str3); static inline void *sat_extend(void *buf, size_t len, size_t nmemb, size_t size, size_t block) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0