Author: mlandres Date: Mon Oct 13 14:17:41 2008 New Revision: 11316 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11316&view=rev Log: - Adapt to satsolver changes. Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/PoolQuery.cc trunk/libzypp/zypp/Repository.cc trunk/libzypp/zypp/repo/DeltaCandidates.cc trunk/libzypp/zypp/sat/LookupAttr.cc Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=11316&r1=11315&r2=11316&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Mon Oct 13 14:17:41 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 13 14:16:25 CEST 2008 - ma@suse.de + +- Adapt to satsolver changes. +- revision 11316 + +------------------------------------------------------------------- Mon Oct 13 13:28:48 CEST 2008 - ma@suse.de - Fix reading delta rpm checksum from solv file. Modified: trunk/libzypp/zypp/PoolQuery.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQuery.cc?rev=11316&r1=11315&r2=11316&view=diff ============================================================================== --- trunk/libzypp/zypp/PoolQuery.cc (original) +++ trunk/libzypp/zypp/PoolQuery.cc Mon Oct 13 14:17:41 2008 @@ -615,7 +615,7 @@ bool PoolQueryIterator::matchSolvable() { - _sid = base().get()->entry; + _sid = base().get()->solvid; bool new_solvable = true; bool matches = !_do_matching; @@ -744,7 +744,7 @@ // trying to reach a matching attribute or the next solvable // thus resulting to a problem in the equal() method ++base_reference(); - new_solvable = base().get()->entry != _sid; + new_solvable = base().get()->solvid != _sid; } // no more attributes in this repo, return else Modified: trunk/libzypp/zypp/Repository.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Repository.cc?rev=11316&r1=11315&r2=11316&view=diff ============================================================================== --- trunk/libzypp/zypp/Repository.cc (original) +++ trunk/libzypp/zypp/Repository.cc Mon Oct 13 14:17:41 2008 @@ -62,7 +62,7 @@ zypp::Date Repository::generatedTimestamp() const { ::Dataiterator di; - ::dataiterator_init(&di, get(), REPOENTRY_META, REPOSITORY_TIMESTAMP, 0, 0); + ::dataiterator_init(&di, get(), SOLVID_META, REPOSITORY_TIMESTAMP, 0, 0); if (::dataiterator_step(&di)) { do @@ -92,7 +92,7 @@ zypp::Date Repository::suggestedExpirationTimestamp() const { ::Dataiterator di; - ::dataiterator_init(&di, get(), REPOENTRY_META, REPOSITORY_EXPIRE, 0, 0); + ::dataiterator_init(&di, get(), SOLVID_META, REPOSITORY_EXPIRE, 0, 0); Date generated = generatedTimestamp(); // do not calculate over a missing generated // timestamp Modified: trunk/libzypp/zypp/repo/DeltaCandidates.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/DeltaCandidates.cc?rev=11316&r1=11315&r2=11316&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/DeltaCandidates.cc (original) +++ trunk/libzypp/zypp/repo/DeltaCandidates.cc Mon Oct 13 14:17:41 2008 @@ -82,7 +82,7 @@ ::Dataiterator di; ::dataiterator_init(&di , it->get() // in this repo - , REPOENTRY_META // in metadata + , SOLVID_META // in metadata , REPOSITORY_DELTAINFO, 0, 0 ); while (::dataiterator_step(&di)) @@ -91,14 +91,14 @@ ::Dataiterator di2; ::dataiterator_init(&di2 , it->get() // in this repo - , REPOENTRY_POS // in metadata + , SOLVID_POS // in metadata , DELTA_PACKAGE_NAME , _pimpl->pkgname.empty() ? 0 : _pimpl->pkgname.c_str() // of this value , SEARCH_STRING); while (::dataiterator_step(&di2)) { ::dataiterator_setpos( &di2 ); - DeltaRpm delta(*it, REPOENTRY_POS); + DeltaRpm delta(*it, SOLVID_POS); DBG << "checking delta: " << delta << endl; if ( ! package || ( package->name() == delta.name() Modified: trunk/libzypp/zypp/sat/LookupAttr.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/LookupAttr.cc?rev=11316&r1=11315&r2=11316&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/LookupAttr.cc (original) +++ trunk/libzypp/zypp/sat/LookupAttr.cc Mon Oct 13 14:17:41 2008 @@ -108,7 +108,7 @@ { return _dip ? Repository( _dip->repo ) : Repository::noRepository; } Solvable LookupAttr::iterator::inSolvable() const - { return _dip ? Solvable( _dip->entry ) : Solvable::noSolvable; } + { return _dip ? Solvable( _dip->solvid ) : Solvable::noSolvable; } SolvAttr LookupAttr::iterator::inSolvAttr() const { return _dip ? SolvAttr( _dip->key->name ) : SolvAttr::noAttr; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org