- support disabling of the "installed" repo

diff --git a/src/pool.c b/src/pool.c
index 9155c2fe2474dc04b051cd8746cbb378b204911f..016de11567a3b7e694d8c1285c042ea774f4bc47 100644 (file)
--- 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 b54b8496bc8d8a3a0eda9d4e7d7d37325df092f5..98f264d7d8a3552487cdec7aa440ecb90c098afe 100644 (file)
--- 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;