make CD ordering function available

 !! only for testsuite !!

diff --git a/zypp/Target.cc b/zypp/Target.cc
index eb03a51..71c342e 100644 (file)
--- 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 d780e6c..588af90 100644 (file)
--- 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 2579572..565766c 100644 (file)
--- 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 3246774..4075fbf 100644 (file)
--- 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: