Author: mlschroe Date: Mon Jun 2 17:07:49 2008 New Revision: 10305 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10305&view=rev Log: - fix rpms2solv dependency generation [bnc#396407] Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/src/dirpool.c branches/SuSE-Linux-11_0-Branch/sat-solver/src/dirpool.h branches/SuSE-Linux-11_0-Branch/sat-solver/src/solver.c branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmdb.c branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_susetags.c Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/src/dirpool.c URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-solver/src/dirpool.c?rev=10305&r1=10304&r2=10305&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/src/dirpool.c (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/src/dirpool.c Mon Jun 2 17:07:49 2008 @@ -10,15 +10,10 @@ #include "pool.h" #include "util.h" +#include "dirpool.h" #define DIR_BLOCK 127 -typedef struct _Dirpool { - Id *dirs; - int ndirs; - Id *dirtraverse; -} Dirpool; - void dirpool_create(Dirpool *dp) { Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/src/dirpool.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-solver/src/dirpool.h?rev=10305&r1=10304&r2=10305&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/src/dirpool.h (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/src/dirpool.h Mon Jun 2 17:07:49 2008 @@ -11,8 +11,6 @@ #include "pooltypes.h" #include "util.h" -#define DIR_BLOCK 127 - typedef struct _Dirpool { Id *dirs; int ndirs; Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-solver/src/solver.c?rev=10305&r1=10304&r2=10305&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/src/solver.c (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/src/solver.c Mon Jun 2 17:07:49 2008 @@ -838,7 +838,7 @@ * */ -void +static void enableweakrules(Solver *solv) { int i; @@ -4250,7 +4250,7 @@ /* if redoq.count == 0 we already found all recommended in the * solver run */ - if (redoq.count || solv->dontinstallrecommended || !solv->dontshowinstalledrecommended) + if (redoq.count || solv->dontinstallrecommended || !solv->dontshowinstalledrecommended || solv->ignorealreadyrecommended) { Id rec, *recp, p, *pp; Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmdb.c URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmdb.c?rev=10305&r1=10304&r2=10305&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmdb.c (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmdb.c Mon Jun 2 17:07:49 2008 @@ -823,7 +823,8 @@ s->provides = makedeps(pool, repo, rpmhead, TAG_PROVIDENAME, TAG_PROVIDEVERSION, TAG_PROVIDEFLAGS, 0); s->provides = addfileprovides(pool, repo, repodata, s, rpmhead, s->provides); - s->provides = repo_addid_dep(repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0); + if (s->arch != ARCH_SRC && s->arch != ARCH_NOSRC) + s->provides = repo_addid_dep(repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0); s->requires = makedeps(pool, repo, rpmhead, TAG_REQUIRENAME, TAG_REQUIREVERSION, TAG_REQUIREFLAGS, 0); s->conflicts = makedeps(pool, repo, rpmhead, TAG_CONFLICTNAME, TAG_CONFLICTVERSION, TAG_CONFLICTFLAGS, 0); s->obsoletes = makedeps(pool, repo, rpmhead, TAG_OBSOLETENAME, TAG_OBSOLETEVERSION, TAG_OBSOLETEFLAGS, 0); Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_susetags.c URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_susetags.c?rev=10305&r1=10304&r2=10305&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_susetags.c (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_susetags.c Mon Jun 2 17:07:49 2008 @@ -378,7 +378,7 @@ * All keys have 3 characters and end in ':' */ -void +static void finish_solvable(struct parsedata *pd, Solvable *s, int handle) { Pool *pool = pd->repo->pool; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org