Mailinglist Archive: zypp-commit (301 mails)

< Previous Next >
[zypp-commit] r7624 - in /branches/use-solv/libzypp/zypp: repo/cached/RepoImpl.cc target/rpm/RpmDb.cc
  • From: matz@xxxxxxxxxxxxxxxx
  • Date: Wed, 24 Oct 2007 15:46:12 -0000
  • Message-id: <20071024154612.4B8E02D1E8@xxxxxxxxxxxxxxxx>
Author: matz
Date: Wed Oct 24 17:46:11 2007
New Revision: 7624

URL: http://svn.opensuse.org/viewcvs/zypp?rev=7624&view=rev
Log:
deps are offsets now -> make it compile again

Modified:
branches/use-solv/libzypp/zypp/repo/cached/RepoImpl.cc
branches/use-solv/libzypp/zypp/target/rpm/RpmDb.cc

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=7624&r1=7623&r2=7624&view=diff
==============================================================================
--- branches/use-solv/libzypp/zypp/repo/cached/RepoImpl.cc (original)
+++ branches/use-solv/libzypp/zypp/repo/cached/RepoImpl.cc Wed Oct 24 17:46:11
2007
@@ -171,12 +171,13 @@
Rel::ANY
};
static inline void
-add_deps (CapFactory &factory, Pool *pool, CapSet &caps, Id *ids)
+add_deps (CapFactory &factory, Pool *pool, CapSet &caps, Source *source,
Offset ofs)
{
+ Id *ids;
Id id;
- char buf[1024];
- if (!ids)
+ if (!ofs)
return;
+ ids = source->idarraydata + ofs;
while((id = *ids++) != 0)
{
if (id2cap.find(id) != id2cap.end())
@@ -219,16 +220,16 @@
ed,
/* XXX Arch needs to become Id based. */
Arch(id2str (pool, s->arch)));
- add_deps (capfactory, pool, nvrad[Dep::PROVIDES], s->provides);
- add_deps (capfactory, pool, nvrad[Dep::REQUIRES], s->requires);
- add_deps (capfactory, pool, nvrad[Dep::CONFLICTS], s->conflicts);
- add_deps (capfactory, pool, nvrad[Dep::OBSOLETES], s->obsoletes);
- add_deps (capfactory, pool, nvrad[Dep::RECOMMENDS], s->recommends);
- add_deps (capfactory, pool, nvrad[Dep::SUGGESTS], s->suggests);
- add_deps (capfactory, pool, nvrad[Dep::FRESHENS], s->freshens);
- add_deps (capfactory, pool, nvrad[Dep::ENHANCES], s->enhances);
- add_deps (capfactory, pool, nvrad[Dep::SUPPLEMENTS], s->supplements);
- //add_deps (capfactory, nvrad[Dep::PREREQUIRES], s->prerequires);
+ 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);
/* 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);

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=7624&r1=7623&r2=7624&view=diff
==============================================================================
--- branches/use-solv/libzypp/zypp/target/rpm/RpmDb.cc (original)
+++ branches/use-solv/libzypp/zypp/target/rpm/RpmDb.cc Wed Oct 24 17:46:11 2007
@@ -1334,11 +1334,13 @@
Rel::ANY
};
static inline void
-add_deps (CapFactory &factory, Pool *pool, CapSet &caps, Id *ids)
+add_deps (CapFactory &factory, Pool *pool, CapSet &caps, Source *source,
Offset ofs)
{
+ Id *ids;
Id id;
- if (!ids)
+ if (!ofs)
return;
+ ids = source->idarraydata + ofs;
while((id = *ids++) != 0)
{
if (id2cap.find(id) != id2cap.end())
@@ -1347,7 +1349,7 @@
}
else
{
- Capability cap = factory.fromId( id );
+ Capability cap = factory.fromId(id);
id2cap[id] = cap;
caps.insert (cap);
}
@@ -1400,16 +1402,16 @@
ed,
/* XXX Arch needs to become Id based. */
Arch(id2str (the_pool, s->arch)));
- add_deps (capfactory, the_pool, nvrad[Dep::PROVIDES],
s->provides);
- add_deps (capfactory, the_pool, nvrad[Dep::REQUIRES],
s->requires);
- add_deps (capfactory, the_pool, nvrad[Dep::CONFLICTS],
s->conflicts);
- add_deps (capfactory, the_pool, nvrad[Dep::OBSOLETES],
s->obsoletes);
- add_deps (capfactory, the_pool, nvrad[Dep::RECOMMENDS],
s->recommends);
- add_deps (capfactory, the_pool, nvrad[Dep::SUGGESTS],
s->suggests);
- add_deps (capfactory, the_pool, nvrad[Dep::FRESHENS],
s->freshens);
- add_deps (capfactory, the_pool, nvrad[Dep::ENHANCES],
s->enhances);
- add_deps (capfactory, the_pool, nvrad[Dep::SUPPLEMENTS],
s->supplements);
- //add_deps (capfactory, nvrad[Dep::PREREQUIRES], s->prerequires);
+ 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);
detail::ResImplTraits<RPMPackageImpl>::Ptr impl( new
RPMPackageImpl() );

Package::Ptr pptr;

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages