From 515f47ba8a0409d96d5964d912e0b8b44a020256 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Thu, 9 Feb 2006 11:45:16 +0000 Subject: [PATCH] bugfix in ignoring cap --- zypp/solver/detail/Resolver.cc | 4 ---- zypp/solver/detail/Types.h | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/zypp/solver/detail/Resolver.cc b/zypp/solver/detail/Resolver.cc index c7dde0f..8db1347 100644 --- a/zypp/solver/detail/Resolver.cc +++ b/zypp/solver/detail/Resolver.cc @@ -104,10 +104,6 @@ Resolver::reset (void) _extra_caps.clear(); _extra_conflicts.clear(); - _ignoreConflicts.clear(); - _ignoreRequires.clear(); - _ignoreArchitecture.clear(); - _ignoreInstalledItem.clear(); _pending_queues.clear(); _pruned_queues.clear(); diff --git a/zypp/solver/detail/Types.h b/zypp/solver/detail/Types.h index 5fa4a44..696c043 100644 --- a/zypp/solver/detail/Types.h +++ b/zypp/solver/detail/Types.h @@ -35,7 +35,7 @@ #include "zypp/PoolItem.h" #define _DEBUG(x) DBG << x << std::endl; -#define _XDEBUG(x) XXX << x << std::endl; +#define _XDEBUG(x) DBG << x << std::endl; //#define _DEBUG(x) ///////////////////////////////////////////////////////////////////////// -- 2.7.4