ref: refs/heads/master
commit ea7b6d8bd4085c157cd9860cd808422a8fe4e040
Author: Michael Schroeder
Date: Thu Jul 9 17:04:04 2009 +0200
- support disabling of the "installed" repo
---
src/pool.c | 4 ++--
src/solver.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/pool.c b/src/pool.c
index 9155c2f..016de11 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -275,7 +275,7 @@ pool_createwhatprovides(Pool *pool)
{
Id *pp;
s = pool->solvables + i;
- if (!s->provides)
+ if (!s->provides || !s->repo || s->repo->disabled)
continue;
/* we always need the installed solvable in the whatprovides data,
otherwise obsoletes/conflicts on them won't work */
@@ -323,7 +323,7 @@ pool_createwhatprovides(Pool *pool)
{
Id *pp;
s = pool->solvables + i;
- if (!s->provides)
+ if (!s->provides || !s->repo || s->repo->disabled)
continue;
if (s->repo != installed && !pool_installable(pool, s))
continue;
diff --git a/src/solver.c b/src/solver.c
index b54b849..98f264d 100644
--- a/src/solver.c
+++ b/src/solver.c
@@ -1435,7 +1435,7 @@ solver_run_sat(Solver *solv, int disablerules, int doweak)
* installed packages
*/
- if (level < systemlevel && solv->installed && solv->installed->nsolvables)
+ if (level < systemlevel && solv->installed && solv->installed->nsolvables && !solv->installed->disabled)
{
Repo *installed = solv->installed;
int pass;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
