kill NAMESPACE_INSTALLED support

Nobody needs it and it was not functual anyway.

diff --git a/src/pool.c b/src/pool.c
index 8de4cc5519d7d84eb9758060eaa53f236a0e4a8e..fd1540635113851763078e2b8319d5117d218492 100644 (file)
--- a/src/pool.c
+++ b/src/pool.c
@@ -1338,7 +1338,7 @@ pool_addfileprovides_dep(Pool *pool, Id *ida, struct searchfiles *sf, struct sea
            dep = rd->name;
          else if (rd->flags == REL_NAMESPACE)
            {
-             if (rd->name == NAMESPACE_INSTALLED || rd->name == NAMESPACE_SPLITPROVIDES)
+             if (rd->name == NAMESPACE_SPLITPROVIDES)
                {
                  csf = isf;
                  if (!csf || MAPTST(&csf->seen, sid))

diff --git a/src/rules.c b/src/rules.c
index edf879bfb40f3957341a014ac30492dbb16b9af6..88c6d5b4ddd265081b600ce04aef1546b6bd07ca 100644 (file)
--- a/src/rules.c
+++ b/src/rules.c
@@ -66,8 +66,6 @@ dep_possible(Solver *solv, Id dep, Map *m)
            }
          if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_SPLITPROVIDES)
            return solver_splitprovides(solv, rd->evr, m);
-         if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_INSTALLED)
-           return solver_dep_installed(solv, rd->evr);
        }
     }
   FOR_PROVIDES(p, pp, dep)
@@ -3538,8 +3536,6 @@ dep_pkgcheck(Solver *solv, Id dep, Map *m, Queue *q)
            }
          if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_SPLITPROVIDES)
            return;
-         if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_INSTALLED)
-           return;
        }
     }
   FOR_PROVIDES(p, pp, dep)
@@ -3576,8 +3572,6 @@ check_xsupp(Solver *solv, Queue *depq, Id dep)
 #else
            return 0;
 #endif
-         if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_INSTALLED)
-           return solver_dep_installed(solv, rd->evr);
        }
       if (depq && rd->flags == REL_NAMESPACE)
        {

diff --git a/src/solver.c b/src/solver.c
index 7a13f9dd71c216693c5e059b92e705c4a208f450..79a37731960ec4fc8da83d04b09c4de428609fcb 100644 (file)
--- a/src/solver.c
+++ b/src/solver.c
@@ -104,38 +104,6 @@ solver_splitprovides(Solver *solv, Id dep, Map *m)
 }
 
 
-/*-------------------------------------------------------------------
- * solver_dep_installed
- */
-
-int
-solver_dep_installed(Solver *solv, Id dep)
-{
-#if 0
-  Pool *pool = solv->pool;
-  Id p, pp;
-
-  if (ISRELDEP(dep))
-    {
-      Reldep *rd = GETRELDEP(pool, dep);
-      if (rd->flags == REL_AND)
-       {
-         if (!solver_dep_installed(solv, rd->name))
-           return 0;
-         return solver_dep_installed(solv, rd->evr);
-       }
-      if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_INSTALLED)
-       return solver_dep_installed(solv, rd->evr);
-    }
-  FOR_PROVIDES(p, pp, dep)
-    {
-      if (p == SYSTEMSOLVABLE || (solv->installed && pool->solvables[p].repo == solv->installed))
-       return 1;
-    }
-#endif
-  return 0;
-}
-
 /* mirrors solver_dep_fulfilled, but returns 2 if a new package
  * was involved */
 static int
@@ -168,8 +136,6 @@ solver_dep_fulfilled_alreadyinstalled(Solver *solv, Id dep)
        }
       if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_SPLITPROVIDES)
         return solver_splitprovides(solv, rd->evr, 0);
-      if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_INSTALLED)
-        return solver_dep_installed(solv, rd->evr);
       if (rd->flags == REL_NAMESPACE && solv->installsuppdepq)
        {
          Queue *q = solv->installsuppdepq;

diff --git a/src/solver_private.h b/src/solver_private.h
index f30b03a91c500015aabe84dcaa7d62a72fe17915..f8df8c7132d0ba03f48910b649d3fbdba53e0329 100644 (file)
--- a/src/solver_private.h
+++ b/src/solver_private.h
@@ -16,7 +16,6 @@
 extern void solver_run_sat(Solver *solv, int disablerules, int doweak);
 extern void solver_reset(Solver *solv);
 
-extern int solver_dep_installed(Solver *solv, Id dep);
 extern int solver_splitprovides(Solver *solv, Id dep, Map *m);
 
 static inline int
@@ -42,8 +41,6 @@ solver_dep_fulfilled(Solver *solv, Id dep)
        }
       if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_SPLITPROVIDES)
         return solver_splitprovides(solv, rd->evr, 0);
-      if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_INSTALLED)
-        return solver_dep_installed(solv, rd->evr);
     }
   FOR_PROVIDES(p, pp, dep)
     {