From: Klaus Kaempf Date: Wed, 29 Mar 2006 09:18:23 +0000 (+0000) Subject: Dont check edition and arch in isParallelInstall, X-Git-Tag: 6.6.0~4007 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0780fdfda586d3396cd8751ab202949fb9400c01;p=platform%2Fupstream%2Flibzypp.git Dont check edition and arch in isParallelInstall, if its the same kind and name, it is a parallel installation --- diff --git a/zypp/solver/detail/ResolverContext.cc b/zypp/solver/detail/ResolverContext.cc index 6a225b109..9cd2d19c9 100644 --- a/zypp/solver/detail/ResolverContext.cc +++ b/zypp/solver/detail/ResolverContext.cc @@ -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(item.resolvable()); + Package::constPtr p2 = asKind(info->other.resolvable()); + if (p1 && p2 && p1->installOnly() && p2->installOnly()) // both are parallel installable + return; + info->flag = true; info->foundItem = item; }