From: Michael Schroeder <mls@suse.de>
Date: Tue, 18 Feb 2014 14:42:07 +0000 (+0100)
Subject: change last commit to check for SOLVER_TRANSACTION_KEEP_PSEUDO
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d0cb06030cf204e7d30d51c86e8dd9141a53a58;p=thirdparty%2Flibsolv.git

change last commit to check for SOLVER_TRANSACTION_KEEP_PSEUDO
---

diff --git a/src/transaction.c b/src/transaction.c
index 31b02117..efa381d1 100644
--- a/src/transaction.c
+++ b/src/transaction.c
@@ -262,14 +262,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 */
 	}