From da64394f8ee1fc71b1cdc66f57999d4fcd2dd1c2 Mon Sep 17 00:00:00 2001 From: Klaus Kaempf Date: Wed, 29 Mar 2006 09:59:36 +0000 Subject: [PATCH] dont log what we already know --- zypp/ui/PatchContentsImpl.cc | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/zypp/ui/PatchContentsImpl.cc b/zypp/ui/PatchContentsImpl.cc index c3587a5..ea0fdad 100644 --- a/zypp/ui/PatchContentsImpl.cc +++ b/zypp/ui/PatchContentsImpl.cc @@ -63,11 +63,18 @@ namespace zypp if ( ! found ) { - // It's perfectly legitimate for that corresponding resolvable not to be in the pool: - // The pool only contains resolvables in matching architectures, yet a - // multi-arch patch might as well contain atoms for different architectures. + Arch system_arch = getZYpp()->architecture(); - DBG << "No resolvable for patch atom in pool (wrong arch?): " + if (! (*atom_it)->arch().compatibleWith( system_arch) ) { + + // It's perfectly legitimate for that corresponding resolvable not to be in the pool: + // The pool only contains resolvables in matching architectures, yet a + // multi-arch patch might as well contain atoms for different architectures. + + continue; + } + + ERR << "No resolvable for patch atom in pool: " << (*atom_it)->name() << "-" << (*atom_it)->edition() << " arch: " << (*atom_it)->arch().asString() << endl; -- 2.7.4