Author: matz Date: Mon Nov 26 02:52:20 2007 New Revision: 7922 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7922&view=rev Log: Cleanup. 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=7922&r1=7921&r2=7922&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/repo/cached/RepoImpl.cc (original) +++ branches/use-solv/libzypp/zypp/repo/cached/RepoImpl.cc Mon Nov 26 02:52:20 2007 @@ -166,7 +166,7 @@ Rel::ANY }; static inline void -add_deps (CapFactory &factory, Pool *pool, CapSet &caps, Repo *repo, Offset ofs) +add_deps (CapSet &caps, Repo *repo, Offset ofs) { Id *ids; if (!ofs) @@ -194,16 +194,16 @@ ed, /* XXX Arch needs to become Id based. */ Arch(id2str (pool, s->arch))); - 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); + add_deps (nvrad[Dep::PROVIDES], repo, s->provides); + add_deps (nvrad[Dep::REQUIRES], repo, s->requires); + add_deps (nvrad[Dep::CONFLICTS], repo, s->conflicts); + add_deps (nvrad[Dep::OBSOLETES], repo, s->obsoletes); + add_deps (nvrad[Dep::RECOMMENDS], repo, s->recommends); + add_deps (nvrad[Dep::SUGGESTS], repo, s->suggests); + add_deps (nvrad[Dep::FRESHENS], repo, s->freshens); + add_deps (nvrad[Dep::ENHANCES], repo, s->enhances); + add_deps (nvrad[Dep::SUPPLEMENTS], repo, s->supplements); + //add_deps (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); 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=7922&r1=7921&r2=7922&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/target/rpm/RpmDb.cc (original) +++ branches/use-solv/libzypp/zypp/target/rpm/RpmDb.cc Mon Nov 26 02:52:20 2007 @@ -1334,7 +1334,7 @@ Rel::ANY }; static inline void -add_deps (CapFactory &factory, Pool *pool, CapSet &caps, Repo *repo, Offset ofs) +add_deps (CapSet &caps, Repo *repo, Offset ofs) { Id *ids; if (!ofs) @@ -1384,16 +1384,16 @@ ed, /* XXX Arch needs to become Id based. */ Arch(id2str (the_pool, s->arch))); - 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); + add_deps (nvrad[Dep::PROVIDES], repo, s->provides); + add_deps (nvrad[Dep::REQUIRES], repo, s->requires); + add_deps (nvrad[Dep::CONFLICTS], repo, s->conflicts); + add_deps (nvrad[Dep::OBSOLETES], repo, s->obsoletes); + add_deps (nvrad[Dep::RECOMMENDS], repo, s->recommends); + add_deps (nvrad[Dep::SUGGESTS], repo, s->suggests); + add_deps (nvrad[Dep::FRESHENS], repo, s->freshens); + add_deps (nvrad[Dep::ENHANCES], repo, s->enhances); + add_deps (nvrad[Dep::SUPPLEMENTS], repo, s->supplements); + //add_deps (nvrad[Dep::PREREQUIRES], repo, s->prerequires); detail::ResImplTraits<RPMPackageImpl>::Ptr impl( new RPMPackageImpl() ); Package::Ptr pptr; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org