Author: mlandres Date: Wed Jun 27 18:12:05 2007 New Revision: 5850 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5850&view=rev Log: reduce logging Modified: branches/REFACTORING-10_3/libzypp/zypp/ZYppCommitPolicy.h branches/REFACTORING-10_3/libzypp/zypp/pool/GetResolvablesToInsDel.cc Modified: branches/REFACTORING-10_3/libzypp/zypp/ZYppCommitPolicy.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/ZYppCommitPolicy.h?rev=5850&r1=5849&r2=5850&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/ZYppCommitPolicy.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/ZYppCommitPolicy.h Wed Jun 27 18:12:05 2007 @@ -47,11 +47,13 @@ { return _syncPoolAfterCommit; } public: - /** Restrict commit to a certain media number - * \deprecated + /** Restrict commit to media 1. + * Fake outstanding YCP fix: Honour restriction to media 1 + * at installation, but install all remaining packages if + * post-boot (called with <tt>mediaNr_r > 1</tt>). */ ZYppCommitPolicy & restrictToMedia( unsigned mediaNr_r ) - { _restrictToMedia = mediaNr_r; return *this; } + { _restrictToMedia = ( mediaNr_r == 1 ) ? 1 : 0; return *this; } /** Process all media (default) */ ZYppCommitPolicy & allMedia() Modified: branches/REFACTORING-10_3/libzypp/zypp/pool/GetResolvablesToInsDel.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/pool/GetResolvablesToInsDel.cc?rev=5850&r1=5849&r2=5850&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/pool/GetResolvablesToInsDel.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/pool/GetResolvablesToInsDel.cc Wed Jun 27 18:12:05 2007 @@ -208,7 +208,7 @@ for ( PoolItemList items = order.computeNextSet(); ! items.empty(); items = order.computeNextSet() ) { - MIL << "order.computeNextSet: " << items.size() << " resolvables" << endl; + XXX << "order.computeNextSet: " << items.size() << " resolvables" << endl; /////////////////////////////////////////////////////////////////// // items contains all objects we could install now. Pick all objects // from current media, or best media if none for current. Alwayys pick @@ -311,7 +311,7 @@ } else { - MIL << "SET CONTINUE [S" << best_prio << ":" << best_medianum << "]" << endl; + XXX << "SET CONTINUE [S" << best_prio << ":" << best_medianum << "]" << endl; } for ( PoolItemList::iterator it = take_list.begin(); it != take_list.end(); ++it ) @@ -327,6 +327,7 @@ } // for all sets computed + MIL << "order done" << endl; if ( instbackup_r.size() != instlist_r.size() ) { ERR << "***************** Lost packages in InstallOrder sort." << endl; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org