]> git.ipfire.org Git - thirdparty/libsolv.git/commitdiff
Always return IGNORE for pseudo packages in RPM_ONLY mode
authorMichael Schroeder <mls@suse.de>
Tue, 18 Feb 2014 14:34:40 +0000 (15:34 +0100)
committerMichael Schroeder <mls@suse.de>
Fri, 21 Feb 2014 17:00:38 +0000 (18:00 +0100)
The example codes already expect this behavior.

src/transaction.c

index 6a3dae941136b71166fc48176df784a1f2def2a0..31b0211722eb93b3ea7888da15c37806b67b27fa 100644 (file)
@@ -261,13 +261,15 @@ transaction_type(Transaction *trans, Id p, int mode)
 
   if ((mode & SOLVER_TRANSACTION_RPM_ONLY) != 0)
     {
-      /* application wants to know what to feed to rpm */
+      /* application wants to know what to feed to the package manager */
+      if (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 (!is_pseudo_package(pool, s) && obsoleted_by_pseudos_only(trans, s - pool->solvables))
+         if (obsoleted_by_pseudos_only(trans, s - pool->solvables))
            return SOLVER_TRANSACTION_ERASE;
          return SOLVER_TRANSACTION_IGNORE;     /* ignore as we're being obsoleted */
        }