change last commit to check for SOLVER_TRANSACTION_KEEP_PSEUDO
authorMichael Schroeder <mls@suse.de>
Tue, 18 Feb 2014 14:42:07 +0000 (15:42 +0100)
committerMichael Schroeder <mls@suse.de>
Tue, 18 Feb 2014 14:42:07 +0000 (15:42 +0100)
src/transaction.c

index e7d3e59..7dac0a8 100644 (file)
@@ -292,14 +292,14 @@ transaction_type(Transaction *trans, Id p, int mode)
   if ((mode & SOLVER_TRANSACTION_RPM_ONLY) != 0)
     {
       /* application wants to know what to feed to the package manager */
-      if (is_pseudo_package(pool, s))
+      if (!(mode & SOLVER_TRANSACTION_KEEP_PSEUDO) && is_pseudo_package(pool, s))
        return SOLVER_TRANSACTION_IGNORE;
       if (type == SOLVER_TRANSACTION_ERASE || type == SOLVER_TRANSACTION_INSTALL || type == SOLVER_TRANSACTION_MULTIINSTALL)
        return type;
       if (s->repo == pool->installed)
        {
          /* check if we're a real package that is obsoleted by pseudos */
-         if (obsoleted_by_pseudos_only(trans, s - pool->solvables))
+         if (!is_pseudo_package(pool, s) && obsoleted_by_pseudos_only(trans, s - pool->solvables))
            return SOLVER_TRANSACTION_ERASE;
          return SOLVER_TRANSACTION_IGNORE;     /* ignore as we're being obsoleted */
        }