Author: matz
Date: Sun Nov 25 04:39:34 2007
New Revision: 7911
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7911&view=rev
Log:
Fixes for changed satsolver interface, like s/Source/Repo/.
Modified:
branches/use-solv/libzypp/zypp/Edition.h
branches/use-solv/libzypp/zypp/RepoManager.cc
branches/use-solv/libzypp/zypp/repo/cached/RepoImpl.cc
branches/use-solv/libzypp/zypp/repo/cached/RepoImpl.h
branches/use-solv/libzypp/zypp/target/rpm/RpmDb.cc
branches/use-solv/libzypp/zypp/target/rpm/RpmDb.h
Modified: branches/use-solv/libzypp/zypp/Edition.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/Edition.h?rev=7911&r1=7910&r2=7911&view=diff
==============================================================================
--- branches/use-solv/libzypp/zypp/Edition.h (original)
+++ branches/use-solv/libzypp/zypp/Edition.h Sun Nov 25 04:39:34 2007
@@ -21,7 +21,7 @@
#include "zypp/RelCompare.h"
#include "zypp/Range.h"
-#include "source_solv.h"
+#include "repo_solv.h"
///////////////////////////////////////////////////////////////////
namespace zypp
Modified: branches/use-solv/libzypp/zypp/RepoManager.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/RepoManager.cc?rev=7911&r1=7910&r2=7911&view=diff
==============================================================================
--- branches/use-solv/libzypp/zypp/RepoManager.cc (original)
+++ branches/use-solv/libzypp/zypp/RepoManager.cc Sun Nov 25 04:39:34 2007
@@ -42,7 +42,7 @@
#include "zypp/ZYppCallbacks.h"
#include "pool.h"
-#include "source_solv.h"
+#include "repo_solv.h"
using namespace std;
using namespace zypp;
@@ -702,13 +702,13 @@
if (needs_cleaning)
{
- cleanCacheInternal( store, info);
Pathname name = _pimpl->options.repoCachePath;
data::RecordId id = store.lookupRepository(info.alias());
ostringstream os;
os << id.get();
name += os.str() + ".solv";
unlink (name);
+ cleanCacheInternal( store, info);
}
MIL << info.alias() << " building cache..." << endl;
@@ -874,7 +874,7 @@
}
Pool *the_pool;
- map repo2source;
+ map repo2solv;
Repository RepoManager::createFromCache( const RepoInfo &info,
const ProgressData::ReceiverFnc & progressrcv )
@@ -899,34 +899,35 @@
}
data::RecordId id = store.lookupRepository(info.alias());
- mapdata::RecordId,Source*::const_iterator it = repo2source.find(id);
- Source *source;
- if (it == repo2source.end())
+ mapdata::RecordId,Repo*::const_iterator it = repo2solv.find(id);
+ Repo *repo;
+ if (it == repo2solv.end())
{
Pathname name = _pimpl->options.repoCachePath;
ostringstream os;
os << id.get();
name += os.str() + ".solv";
- source = 0;
+ repo = 0;
//cerr << "BLA: " << name.asString() << endl;
if (PathInfo(name.asString()).isExist())
{
FILE *fp = fopen (name.c_str(), "r");
if (fp)
{
- source = pool_addsource_solv(the_pool, fp, name.c_str());
+ repo = repo_create (the_pool, name.c_str());
+ repo_add_solv (repo, fp);
fclose (fp);
}
}
- repo2source[id] = source;
+ repo2solv[id] = repo;
} else
- source = it->second;
+ repo = it->second;
CombinedProgressData subprogrcv(progress);
repo::cached::RepoOptions opts( info, _pimpl->options.repoCachePath, id );
opts.readingResolvablesProgress = subprogrcv;
- opts.source = source;
+ opts.repo = repo;
repo::cached::RepoImpl::Ptr repoimpl =
new repo::cached::RepoImpl( opts );
Modified: branches/use-solv/libzypp/zypp/repo/cached/RepoImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/repo/cached/RepoImpl.cc?rev=7911&r1=7910&r2=7911&view=diff
==============================================================================
--- branches/use-solv/libzypp/zypp/repo/cached/RepoImpl.cc (original)
+++ branches/use-solv/libzypp/zypp/repo/cached/RepoImpl.cc Sun Nov 25 04:39:34 2007
@@ -38,9 +38,6 @@
#include "zypp/repo/cached/AtomImpl.h"
#include "zypp/cache/CacheAttributes.h"
-#include "pool.h"
-#include "source_solv.h"
-
using namespace zypp::detail;
using namespace zypp::cache;
using namespace std;
@@ -171,13 +168,13 @@
Rel::ANY
};
static inline void
-add_deps (CapFactory &factory, Pool *pool, CapSet &caps, Source *source, Offset ofs)
+add_deps (CapFactory &factory, Pool *pool, CapSet &caps, Repo *repo, Offset ofs)
{
Id *ids;
Id id;
if (!ofs)
return;
- ids = source->idarraydata + ofs;
+ ids = repo->idarraydata + ofs;
while((id = *ids++) != 0)
{
if (id2cap.find(id) != id2cap.end())
@@ -193,16 +190,16 @@
}
}
-void RepoImpl::createResFromSource()
+void RepoImpl::createResFromRepo()
{
- Source *source = _options.source;
- Pool *pool = source->pool;
+ Repo *repo = _options.repo;
+ Pool *pool = repo->pool;
int i;
- cerr << "SOLV: have " << source->nsolvables << " solvables" << endl;
+ Solvable *s;
+ cerr << "SOLV: have " << repo->nsolvables << " solvables" << endl;
CapFactory capfactory;
- for (i = source->start; i < source->start + source->nsolvables; i++)
+ FOR_REPO_SOLVABLES (repo, i, s)
{
- Solvable *s = pool->solvables + i;
data::RecordId id(i);
Resolvable::Kind kind;
Edition ed;
@@ -220,16 +217,16 @@
ed,
/* XXX Arch needs to become Id based. */
Arch(id2str (pool, s->arch)));
- add_deps (capfactory, pool, nvrad[Dep::PROVIDES], source, s->provides);
- add_deps (capfactory, pool, nvrad[Dep::REQUIRES], source, s->requires);
- add_deps (capfactory, pool, nvrad[Dep::CONFLICTS], source, s->conflicts);
- add_deps (capfactory, pool, nvrad[Dep::OBSOLETES], source, s->obsoletes);
- add_deps (capfactory, pool, nvrad[Dep::RECOMMENDS], source, s->recommends);
- add_deps (capfactory, pool, nvrad[Dep::SUGGESTS], source, s->suggests);
- add_deps (capfactory, pool, nvrad[Dep::FRESHENS], source, s->freshens);
- add_deps (capfactory, pool, nvrad[Dep::ENHANCES], source, s->enhances);
- add_deps (capfactory, pool, nvrad[Dep::SUPPLEMENTS], source, s->supplements);
- //add_deps (capfactory, nvrad[Dep::PREREQUIRES], source, s->prerequires);
+ add_deps (capfactory, pool, nvrad[Dep::PROVIDES], repo, s->provides);
+ add_deps (capfactory, pool, nvrad[Dep::REQUIRES], repo, s->requires);
+ add_deps (capfactory, pool, nvrad[Dep::CONFLICTS], repo, s->conflicts);
+ add_deps (capfactory, pool, nvrad[Dep::OBSOLETES], repo, s->obsoletes);
+ add_deps (capfactory, pool, nvrad[Dep::RECOMMENDS], repo, s->recommends);
+ add_deps (capfactory, pool, nvrad[Dep::SUGGESTS], repo, s->suggests);
+ add_deps (capfactory, pool, nvrad[Dep::FRESHENS], repo, s->freshens);
+ add_deps (capfactory, pool, nvrad[Dep::ENHANCES], repo, s->enhances);
+ add_deps (capfactory, pool, nvrad[Dep::SUPPLEMENTS], repo, s->supplements);
+ //add_deps (capfactory, nvrad[Dep::PREREQUIRES], repo, s->prerequires);
/* XXX do something about the kind stuff, s->name contains it,
but zypp wants to have it as extra field. */
kind = kind_for_name (name, s->arch);
@@ -246,12 +243,12 @@
CombinedProgressData subprogrcv(ticks);
debug::Measure m("create resolvables");
- if (_options.source)
+ if (_options.repo)
{
- createResFromSource();
+ createResFromRepo();
return;
}
- cerr << "AIEEEH, no SOLV source" << endl;
+ cerr << "AIEEEH, no SOLV repo" << endl;
}
void RepoImpl::createPatchAndDeltas()
Modified: branches/use-solv/libzypp/zypp/repo/cached/RepoImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/repo/cached/RepoImpl.h?rev=7911&r1=7910&r2=7911&view=diff
==============================================================================
--- branches/use-solv/libzypp/zypp/repo/cached/RepoImpl.h (original)
+++ branches/use-solv/libzypp/zypp/repo/cached/RepoImpl.h Sun Nov 25 04:39:34 2007
@@ -25,7 +25,7 @@
#include "zypp/cache/ResolvableQuery.h"
#include "zypp/RepoInfo.h"
-#include "source_solv.h"
+#include "repo_solv.h"
///////////////////////////////////////////////////////////////////
namespace zypp
@@ -46,7 +46,7 @@
: repoinfo(repoinfo_)
, dbdir(dbdir_)
, repository_id(repository_id_)
- , source(0)
+ , repo(0)
{}
@@ -55,7 +55,7 @@
RepoInfo repoinfo;
Pathname dbdir;
data::RecordId repository_id;
- Source *source;
+ Repo *repo;
};
/**
@@ -86,7 +86,7 @@
std::map > &nvras,
ProgressData &ticks );
void insertNVRAD (data::RecordId id, Resolvable::Kind kind, const NVRAD &nvrad);
- void createResFromSource();
+ void createResFromRepo();
cache::CacheTypes _type_cache;
cache::ResolvableQuery _rquery;
RepoOptions _options;
Modified: branches/use-solv/libzypp/zypp/target/rpm/RpmDb.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/target/rpm/RpmDb.cc?rev=7911&r1=7910&r2=7911&view=diff
==============================================================================
--- branches/use-solv/libzypp/zypp/target/rpm/RpmDb.cc (original)
+++ branches/use-solv/libzypp/zypp/target/rpm/RpmDb.cc Sun Nov 25 04:39:34 2007
@@ -51,6 +51,8 @@
#include "zypp/ZYppFactory.h"
#include "zypp/TmpPath.h"
+#include "repo_solv.h"
+
#ifndef _
#define _(X) X
#endif
@@ -283,7 +285,7 @@
RpmDb::RpmDb()
: _dbStateInfo( DbSI_NO_INIT )
, _packages( * new Packages ) // delete in destructor
- , source(0)
+ , repo(0)
#warning Check for obsolete memebers
, _backuppath ("/var/adm/backup")
, _packagebackups(false)
@@ -1334,13 +1336,13 @@
Rel::ANY
};
static inline void
-add_deps (CapFactory &factory, Pool *pool, CapSet &caps, Source *source, Offset ofs)
+add_deps (CapFactory &factory, Pool *pool, CapSet &caps, Repo *repo, Offset ofs)
{
Id *ids;
Id id;
if (!ofs)
return;
- ids = source->idarraydata + ofs;
+ ids = repo->idarraydata + ofs;
while((id = *ids++) != 0)
{
if (id2cap.find(id) != id2cap.end())
@@ -1364,27 +1366,28 @@
}
_packages.clear();
- if (source)
+ if (repo)
{
- pool_freesource (the_pool, source);
- source = 0;
+ repo_free (repo, 0);
+ repo = 0;
}
if (update_solv ((root() + dbPath()).asString()))
{
FILE *fp = fopen ("/tmp/system.solv", "r");
if (fp)
{
- source = pool_addsource_solv(the_pool, fp, "system");
+ repo = repo_create (the_pool, "system");
+ repo_add_solv (repo, fp);
fclose (fp);
}
- if (source)
+ if (repo)
{
int i;
- cerr << "SOLV: have " << source->nsolvables << " solvables" << endl;
+ Solvable *s;
+ cerr << "SOLV: have " << repo->nsolvables << " solvables" << endl;
CapFactory capfactory;
- for (i = source->start; i < source->start + source->nsolvables; i++)
+ FOR_REPO_SOLVABLES (repo, i, s)
{
- Solvable *s = the_pool->solvables + i;
data::RecordId id(i);
Resolvable::Kind kind;
Edition ed;
@@ -1402,16 +1405,16 @@
ed,
/* XXX Arch needs to become Id based. */
Arch(id2str (the_pool, s->arch)));
- add_deps (capfactory, the_pool, nvrad[Dep::PROVIDES], source, s->provides);
- add_deps (capfactory, the_pool, nvrad[Dep::REQUIRES], source, s->requires);
- add_deps (capfactory, the_pool, nvrad[Dep::CONFLICTS], source, s->conflicts);
- add_deps (capfactory, the_pool, nvrad[Dep::OBSOLETES], source, s->obsoletes);
- add_deps (capfactory, the_pool, nvrad[Dep::RECOMMENDS], source, s->recommends);
- add_deps (capfactory, the_pool, nvrad[Dep::SUGGESTS], source, s->suggests);
- add_deps (capfactory, the_pool, nvrad[Dep::FRESHENS], source, s->freshens);
- add_deps (capfactory, the_pool, nvrad[Dep::ENHANCES], source, s->enhances);
- add_deps (capfactory, the_pool, nvrad[Dep::SUPPLEMENTS], source, s->supplements);
- //add_deps (capfactory, nvrad[Dep::PREREQUIRES], source, s->prerequires);
+ add_deps (capfactory, the_pool, nvrad[Dep::PROVIDES], repo, s->provides);
+ add_deps (capfactory, the_pool, nvrad[Dep::REQUIRES], repo, s->requires);
+ add_deps (capfactory, the_pool, nvrad[Dep::CONFLICTS], repo, s->conflicts);
+ add_deps (capfactory, the_pool, nvrad[Dep::OBSOLETES], repo, s->obsoletes);
+ add_deps (capfactory, the_pool, nvrad[Dep::RECOMMENDS], repo, s->recommends);
+ add_deps (capfactory, the_pool, nvrad[Dep::SUGGESTS], repo, s->suggests);
+ add_deps (capfactory, the_pool, nvrad[Dep::FRESHENS], repo, s->freshens);
+ add_deps (capfactory, the_pool, nvrad[Dep::ENHANCES], repo, s->enhances);
+ add_deps (capfactory, the_pool, nvrad[Dep::SUPPLEMENTS], repo, s->supplements);
+ //add_deps (capfactory, nvrad[Dep::PREREQUIRES], repo, s->prerequires);
detail::ResImplTraits<RPMPackageImpl>::Ptr impl( new RPMPackageImpl() );
Package::Ptr pptr;
@@ -1438,7 +1441,7 @@
librpmDb::db_const_iterator iter;
CapFactory _f;
- if (!source) {
+ if (!repo) {
unsigned expect = 0;
librpmDb::constPtr dbptr;
librpmDb::dbAccess( dbptr );
Modified: branches/use-solv/libzypp/zypp/target/rpm/RpmDb.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/target/rpm/RpmDb.h?rev=7911&r1=7910&r2=7911&view=diff
==============================================================================
--- branches/use-solv/libzypp/zypp/target/rpm/RpmDb.h (original)
+++ branches/use-solv/libzypp/zypp/target/rpm/RpmDb.h Sun Nov 25 04:39:34 2007
@@ -31,7 +31,7 @@
#include "zypp/ZYppCallbacks.h"
#include "pool.h"
-#include "source_solv.h"
+#include "repo_solv.h"
namespace zypp
{
@@ -242,7 +242,7 @@
class Packages;
Packages & _packages;
- Source *source;
+ Repo *repo;
std::setstd::string _filerequires;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
