Author: jkupec Date: Mon Jul 21 19:16:06 2008 New Revision: 10623 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10623&view=rev Log: - don't mark mutliple patch solvables with the same name for installation (bnc #400895) Modified: trunk/zypper/src/update.cc Modified: trunk/zypper/src/update.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/update.cc?rev=10623&r1=10622&r2=10623&view=diff ============================================================================== --- trunk/zypper/src/update.cc (original) +++ trunk/zypper/src/update.cc Mon Jul 21 19:16:06 2008 @@ -564,10 +564,10 @@ { DBG << "marking all needed patches" << endl; - for_(it, God->pool().byKindBegin(ResKind::patch), - God->pool().byKindEnd (ResKind::patch)) + for_(it, God->pool().proxy().byKindBegin(ResKind::patch), + God->pool().proxy().byKindEnd (ResKind::patch)) { - if (mark_patch_update(*it, skip_interactive, ignore_affects_pm)) + if (mark_patch_update((*it)->candidateObj(), skip_interactive, ignore_affects_pm)) any_marked = true; } } @@ -597,9 +597,9 @@ } else { - for_(pit, q.poolItemBegin(), q.poolItemEnd()) + for_(pit, q.selectableBegin(), q.selectableEnd()) { - any_marked = mark_patch_update(*pit, skip_interactive, ignore_affects_pm); + any_marked = mark_patch_update((*pit)->candidateObj(), skip_interactive, ignore_affects_pm); } } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org