From c8aad47bafed05d147c35fcd894554ce7f7d5318 Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Fri, 15 Feb 2008 16:53:34 +0000 Subject: [PATCH] debug output fixed --- zypp/ResObject.cc | 2 +- zypp/sat/Solvable.cc | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/zypp/ResObject.cc b/zypp/ResObject.cc index 6d34a3d13..e802d97e5 100644 --- a/zypp/ResObject.cc +++ b/zypp/ResObject.cc @@ -102,7 +102,7 @@ namespace zypp // std::ostream & ResObject::dumpOn( std::ostream & str ) const { - return Resolvable::dumpOn( str << "[S" << repository().numericId() << ":" << mediaNr() << "]" ); + return Resolvable::dumpOn( str ); } /////////////////////////////////////////////////////////////////// diff --git a/zypp/sat/Solvable.cc b/zypp/sat/Solvable.cc index a0d2b5118..b0a87babb 100644 --- a/zypp/sat/Solvable.cc +++ b/zypp/sat/Solvable.cc @@ -81,7 +81,7 @@ namespace zypp { return repo_lookup_num(this->get(), attr.idStr().id()); } - + bool Solvable::lookupBoolAttribute( const SolvAttr &attr ) const { return repo_lookup_num(this->get(), attr.idStr().id()) > 0; @@ -150,7 +150,7 @@ namespace zypp } medianr = lc.medianr; std::string ret; - + if (!lc.trivial) { if (lc.mediafile) @@ -366,10 +366,10 @@ namespace zypp if ( ! obj ) return str << "sat::solvable()"; - return str << "sat::solvable(" << obj.id() << "|" + return str << "(" << obj.id() << ")" << ( obj.isKind( ResKind::srcpackage ) ? "srcpackage:" : "" ) << obj.ident() - << '-' << obj.edition() << '.' << obj.arch() << "){" - << obj.repo().name() << "}"; + << '-' << obj.edition() << '.' << obj.arch() << "(" + << obj.repo().name() << ")"; } /****************************************************************** -- 2.34.1