- change allowselfconflicts to forbidselfconflicts now that rpm also allows them.

diff --git a/src/pool.c b/src/pool.c
index 77704a1..9f6198e 100644 (file)
--- a/src/pool.c
+++ b/src/pool.c
@@ -63,9 +63,6 @@ pool_create(void)
   queue_init(&pool->vendormap);
 
   pool->debugmask = SOLV_DEBUG_RESULT; /* FIXME */
-#ifndef RPM5
-  pool->allowselfconflicts = 1;
-#endif
 #ifdef FEDORA
   pool->obsoleteusescolors = 1;
 #endif
@@ -73,6 +70,7 @@ pool_create(void)
   pool->disttype = DISTTYPE_DEB;
 #endif
 #ifdef RPM5
+  pool->forbidselfconflicts = 1;
   pool->obsoleteusesprovides = 1;
   pool->implicitobsoleteusesprovides = 1;
 #endif
@@ -136,8 +134,8 @@ pool_get_flag(Pool *pool, int flag)
     {
     case POOL_FLAG_PROMOTEEPOCH:
       return pool->promoteepoch;
-    case POOL_FLAG_ALLOWSELFCONFLICTS:
-      return pool->allowselfconflicts;
+    case POOL_FLAG_FORBIDSELFCONFLICTS:
+      return pool->forbidselfconflicts;
     case POOL_FLAG_OBSOLETEUSESPROVIDES:
       return pool->obsoleteusesprovides;
     case POOL_FLAG_IMPLICITOBSOLETEUSESPROVIDES:
@@ -161,8 +159,8 @@ pool_set_flag(Pool *pool, int flag, int value)
     case POOL_FLAG_PROMOTEEPOCH:
       pool->promoteepoch = value;
       break;
-    case POOL_FLAG_ALLOWSELFCONFLICTS:
-      pool->allowselfconflicts = value;
+    case POOL_FLAG_FORBIDSELFCONFLICTS:
+      pool->forbidselfconflicts = value;
       break;
     case POOL_FLAG_OBSOLETEUSESPROVIDES:
       pool->obsoleteusesprovides = value;

diff --git a/src/pool.h b/src/pool.h
index 121eb56..4191f53 100644 (file)
--- a/src/pool.h
+++ b/src/pool.h
@@ -126,7 +126,7 @@ struct _Pool {
   int implicitobsoleteusesprovides;    /* true: implicit obsoletes due to same name are matched against provides, not names */
   int obsoleteusescolors;      /* true: obsoletes check arch color */
   int noinstalledobsoletes;    /* true: ignore obsoletes of installed packages */
-  int allowselfconflicts;      /* true: packages which conflict with itself are installable */
+  int forbidselfconflicts;     /* true: packages which conflict with itself are not installable */
 
   /* hash for rel unification */
   Hashtable relhashtbl;                /* hashtable: (name,evr,op)Hash -> Id */
@@ -162,7 +162,7 @@ struct _Pool {
 #define SOLV_DEBUG_TO_STDERR           (1<<30)
 
 #define POOL_FLAG_PROMOTEEPOCH                         1
-#define POOL_FLAG_ALLOWSELFCONFLICTS                   2
+#define POOL_FLAG_FORBIDSELFCONFLICTS                  2
 #define POOL_FLAG_OBSOLETEUSESPROVIDES                 3
 #define POOL_FLAG_IMPLICITOBSOLETEUSESPROVIDES         4
 #define POOL_FLAG_OBSOLETEUSESCOLORS                   5

diff --git a/src/rules.c b/src/rules.c
index eb56233..b03b91f 100644 (file)
--- a/src/rules.c
+++ b/src/rules.c
@@ -635,7 +635,7 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m)
                  if (dontfix && pool->solvables[p].repo == installed)
                    continue;
                  /* p == n: self conflict */
-                 if (p == n && !pool->allowselfconflicts)
+                 if (p == n && pool->forbidselfconflicts)
                    {
                      if (ISRELDEP(con))
                        {

diff --git a/src/solver.c b/src/solver.c
index 2b22bd3..3551f58 100644 (file)
--- a/src/solver.c
+++ b/src/solver.c
@@ -2482,7 +2482,7 @@ solver_solve(Solver *solv, Queue *job)
   POOL_DEBUG(SOLV_DEBUG_STATS, "solver started\n");
   POOL_DEBUG(SOLV_DEBUG_STATS, "dosplitprovides=%d, noupdateprovide=%d noinfarchcheck=%d\n", solv->dosplitprovides, solv->noupdateprovide, solv->noinfarchcheck);
   POOL_DEBUG(SOLV_DEBUG_STATS, "allowuninstall=%d, allowdowngrade=%d, allowarchchange=%d, allowvendorchange=%d\n", solv->allowuninstall, solv->allowdowngrade, solv->allowarchchange, solv->allowvendorchange);
-  POOL_DEBUG(SOLV_DEBUG_STATS, "promoteepoch=%d, allowselfconflicts=%d\n", pool->promoteepoch, pool->allowselfconflicts);
+  POOL_DEBUG(SOLV_DEBUG_STATS, "promoteepoch=%d, forbidselfconflicts=%d\n", pool->promoteepoch, pool->forbidselfconflicts);
   POOL_DEBUG(SOLV_DEBUG_STATS, "obsoleteusesprovides=%d, implicitobsoleteusesprovides=%d, obsoleteusescolors=%d\n", pool->obsoleteusesprovides, pool->implicitobsoleteusesprovides, pool->obsoleteusescolors);
   POOL_DEBUG(SOLV_DEBUG_STATS, "dontinstallrecommended=%d, ignorealreadyrecommended=%d\n", solv->dontinstallrecommended, solv->ignorealreadyrecommended);