Author: jkupec Date: Mon Jul 21 17:43:06 2008 New Revision: 10619 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10619&view=rev Log: - don't mark mutliple patch solvables with the same name for installation (bnc #400895) Modified: branches/SuSE-Linux-11_0-Branch/zypper/src/zypper-misc.cc Modified: branches/SuSE-Linux-11_0-Branch/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/zypper/src/zypper-misc.cc?rev=10619&r1=10618&r2=10619&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/zypper/src/zypper-misc.cc (original) +++ branches/SuSE-Linux-11_0-Branch/zypper/src/zypper-misc.cc Mon Jul 21 17:43:06 2008 @@ -2139,10 +2139,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; } } @@ -2172,9 +2172,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