Dont check edition and arch in isParallelInstall,
authorKlaus Kaempf <kkaempf@suse.de>
Wed, 29 Mar 2006 09:18:23 +0000 (09:18 +0000)
committerKlaus Kaempf <kkaempf@suse.de>
Wed, 29 Mar 2006 09:18:23 +0000 (09:18 +0000)
  if its the same kind and name, it is a parallel installation

zypp/solver/detail/ResolverContext.cc

index 6a225b109107f698a8b4f33144a2ebe91588e75e..9cd2d19c93d8246d2f829749eb8a2627f737ddf0 100644 (file)
@@ -1511,10 +1511,17 @@ dup_name_check_cb (PoolItem_Ref item, const ResStatus & status, void *data)
        && status.isToBeInstalled ()
        && info->other->kind() == item->kind()
        && info->other->name() == item->name()
+#if 0
        && item->edition().compare(info->other->edition()) == 0
        && item->arch() == info->other->arch()
-       && item->source() != info->other->source()) // if it's exactly the same package, ignore it silently.
+#endif
+       && item != info->other) // if it's exactly the same package, ignore it silently.
     {
+       Package::constPtr p1 = asKind<Package>(item.resolvable());
+       Package::constPtr p2 = asKind<Package>(info->other.resolvable());
+       if (p1 && p2 && p1->installOnly() && p2->installOnly())         // both are parallel installable
+           return;
+
        info->flag = true;
        info->foundItem = item;
     }