Hello community, here is the log from the commit of package libzypp checked in at Wed May 3 12:26:02 CEST 2006. -------- --- libzypp/libzypp.changes 2006-05-03 01:43:47.000000000 +0200 +++ STABLE/libzypp/libzypp.changes 2006-05-03 12:24:29.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 3 12:23:36 CEST 2006 - kkaempf@suse.de + +- backout rev 3246->3275 of TargetImpl.cc + +------------------------------------------------------------------- New: ---- restrict-backout.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.a5u43Q/_old 2006-05-03 12:25:37.000000000 +0200 +++ /var/tmp/diff_new_pack.a5u43Q/_new 2006-05-03 12:25:37.000000000 +0200 @@ -18,9 +18,10 @@ Autoreqprov: on Summary: Package, Patch, Pattern, and Product Management Version: 0.0.8 -Release: 141 +Release: 143 Source: zypp-0.0.0.tar.bz2 -Patch: zypp-0.0.0.dif +Patch1: zypp-0.0.0.dif +Patch2: restrict-backout.diff Prefix: /usr Provides: yast2-packagemanager Obsoletes: yast2-packagemanager @@ -64,7 +65,8 @@ %prep %setup -q -n zypp-0.0.0 -%patch +%patch1 +%patch2 %build mv configure.ac x @@ -105,6 +107,8 @@ %{_libdir}/pkgconfig/libzypp.pc %changelog -n libzypp +* Wed May 03 2006 - kkaempf@suse.de +- backout rev 3246->3275 of TargetImpl.cc * Wed May 03 2006 - ro@suse.de - add missing testsuite/utils/TestUtils.h * Tue May 02 2006 - dmacvicar@suse.de ++++++ restrict-backout.diff ++++++ Index: zypp/target/TargetImpl.cc =================================================================== --- zypp/target/TargetImpl.cc (revision 3275) +++ zypp/target/TargetImpl.cc (revision 3246) @@ -145,15 +145,8 @@ - ZYppCommitResult TargetImpl::commit( ResPool pool_r, const ZYppCommitPolicy & policy_rX ) + ZYppCommitResult TargetImpl::commit( ResPool pool_r, const ZYppCommitPolicy & policy_r ) { - // ----------------------------------------------------------------- // - // Fake outstanding YCP fix: Honour restriction to media 1 - // at installation, but install all remaining packages if post-boot. - ZYppCommitPolicy policy_r( policy_rX ); - if ( policy_r.restrictToMedia() > 1 ) - policy_r.allMedia(); - // ----------------------------------------------------------------- // MIL << "TargetImpl::commit(<pool>, " << policy_r << ")" << endl; ZYppCommitResult result; #warning Commit does not provide ZYppCommitResult::_errors @@ -178,29 +171,19 @@ TargetImpl::PoolItemList current_install; TargetImpl::PoolItemList current_srcinstall; - // Collect until the 1st package from an unwanted media occurs. - // Further collection could violate install order. - bool hitUnwantedMedia = false; for (TargetImpl::PoolItemList::iterator it = to_install.begin(); it != to_install.end(); ++it) { Resolvable::constPtr res( it->resolvable() ); Package::constPtr pkg( asKind<Package>(res) ); - if ( pkg ) - { - if ( hitUnwantedMedia || policy_r.restrictToMedia() != pkg->mediaId() ) - { - hitUnwantedMedia = true; - result._remaining.push_back( *it ); - } - else - { - current_install.push_back( *it ); - } - } + if (pkg && policy_r.restrictToMedia() != pkg->mediaId()) // check medianr for packages only + { + XXX << "Package " << *pkg << ", wrong media " << pkg->mediaId() << endl; + result._remaining.push_back( *it ); + } else - { - current_install.push_back( *it ); - } + { + current_install.push_back( *it ); + } } TargetImpl::PoolItemList bad = commit( current_install, policy_r, pool_r ); result._remaining.insert(result._remaining.end(), bad.begin(), bad.end()); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...