Author: dmacvicar Date: Wed Jan 23 19:32:41 2008 New Revision: 8354 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8354&view=rev Log: uhm, for some reason I only get one resolvable in the store, will fix tomorrow Modified: branches/tmp/ma/jump_sat/libzypp/tests/zypp/RepoManager_test.cc branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc branches/tmp/ma/jump_sat/libzypp/zypp/repo/cached/RepoImpl.cc Modified: branches/tmp/ma/jump_sat/libzypp/tests/zypp/RepoManager_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests/zypp/RepoManager_test.cc?rev=8354&r1=8353&r2=8354&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/tests/zypp/RepoManager_test.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/tests/zypp/RepoManager_test.cc Wed Jan 23 19:32:41 2008 @@ -146,6 +146,14 @@ ResStore store = repository.resolvables(); MIL << store.size() << " resolvables" << endl; + BOOST_CHECK_EQUAL( store.size(), 47 ); + + ResStore::const_iterator it = store.begin(); + for ( ; it != store.end(); ++it ) + { + MIL << *it << endl; + } + //manager.refreshMetadata(repo); if ( manager.isCached(repo ) ) Modified: branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc?rev=8354&r1=8353&r2=8354&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc Wed Jan 23 19:32:41 2008 @@ -936,9 +936,10 @@ repo::cached::RepoImpl::Ptr repoimpl = new repo::cached::RepoImpl( opts ); + //repoimpl->createResolvables(); repoimpl->resolvables(); // read the resolvables from cache - return Repository::noRepository; + //return Repository::noRepository; return Repository(repoimpl); } Modified: branches/tmp/ma/jump_sat/libzypp/zypp/repo/cached/RepoImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/repo/cached/RepoImpl.cc?rev=8354&r1=8353&r2=8354&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/repo/cached/RepoImpl.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/repo/cached/RepoImpl.cc Wed Jan 23 19:32:41 2008 @@ -50,17 +50,19 @@ sat::Pool satpool( sat::Pool::instance() ); Pathname solvfile = (_options.solvdir + _options.repoinfo.alias()).extend(".solv"); + satpool.addRepoSolv(solvfile, _options.repoinfo.alias() ); + MIL << satpool << endl; sat::Repo repo = satpool.reposFind( _options.repoinfo.alias() ); - sat::Repo::SolvableIterator it(repo.solvablesBegin()); + sat::Repo::SolvableIterator it; if ( repo != sat::Repo::norepo ) { - for ( ; it != repo.solvablesEnd(); ++it ) + for ( it = repo.solvablesBegin(); it != repo.solvablesEnd(); ++it ) { - _store.insert( makeResObject(*it) ); - //MIL << *it << endl; + _store.insert( makeResObject(*it) ); + MIL << *it << endl; } } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org