From 23bb3ecde01b2b603caf88df7ceb1c6dd43fecf8 Mon Sep 17 00:00:00 2001 From: Klaus Kaempf Date: Fri, 10 Feb 2006 15:55:00 +0000 Subject: [PATCH] make CD ordering function available !! only for testsuite !! --- zypp/Target.cc | 5 +++++ zypp/Target.h | 7 +++++++ zypp/target/TargetImpl.cc | 4 ++-- zypp/target/TargetImpl.h | 5 +++-- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/zypp/Target.cc b/zypp/Target.cc index eb03a5107..71c342eb1 100644 --- a/zypp/Target.cc +++ b/zypp/Target.cc @@ -92,6 +92,11 @@ namespace zypp std::ostream & Target::dumpOn( std::ostream & str ) const { return _pimpl->dumpOn( str ); } + void Target::getResolvablesToInsDel ( const ResPool pool_r, + PoolItemList & dellist_r, + PoolItemList & instlist_r, + PoolItemList & srclist_r ) const + { _pimpl->getResolvablesToInsDel( pool_r, dellist_r, instlist_r, srclist_r ); } ///////////////////////////////////////////////////////////////// } // namespace zypp diff --git a/zypp/Target.h b/zypp/Target.h index d780e6c19..588af9042 100644 --- a/zypp/Target.h +++ b/zypp/Target.h @@ -69,6 +69,13 @@ namespace zypp ResObject::constPtr whoOwnsFile (const std::string & path_str) const; + /** JUST FOR TESTSUITE */ + /** Sort according to prereqs and media numbers */ + void getResolvablesToInsDel ( const ResPool pool_r, + PoolItemList & dellist_r, + PoolItemList & instlist_r, + PoolItemList & srclist_r ) const; + #ifndef STORAGE_DISABLED /** enables the storage target */ bool isStorageEnabled() const; diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc index 25795721b..565766ce0 100644 --- a/zypp/target/TargetImpl.cc +++ b/zypp/target/TargetImpl.cc @@ -408,7 +408,7 @@ void TargetImpl::getResolvablesToInsDel ( const ResPool pool_r, PoolItemList & dellist_r, PoolItemList & instlist_r, - PoolItemList & srclist_r ) + PoolItemList & srclist_r ) const { dellist_r.clear(); instlist_r.clear(); @@ -560,7 +560,7 @@ MIL << "Not a package " << *cit << endl; other_list.push_back( *cit ); continue; } -MIL << "Package " << *cpkg << ", media " << cpkg->mediaId() << endl; +MIL << "Package " << *cpkg << ", media " << cpkg->mediaId() << " last_medianum " << last_medianum << " best_medianum " << best_medianum << endl; if ( // rankPriority[cpkg->instSrcRank()] == last_prio && cpkg->mediaId() == last_medianum ) { // prefer packages on current media. diff --git a/zypp/target/TargetImpl.h b/zypp/target/TargetImpl.h index 3246774b2..4075fbfc1 100644 --- a/zypp/target/TargetImpl.h +++ b/zypp/target/TargetImpl.h @@ -48,12 +48,13 @@ namespace zypp { friend std::ostream & operator<<( std::ostream & str, const TargetImpl & obj ); - private: + public: + /** JUST FOR TESTSUITE */ /** Sort according to prereqs and media numbers */ void getResolvablesToInsDel ( const ResPool pool_r, PoolItemList & dellist_r, PoolItemList & instlist_r, - PoolItemList & srclist_r ); + PoolItemList & srclist_r ) const; public: -- 2.34.1