Author: lslezak Date: Thu Sep 30 18:26:37 2010 New Revision: 62512 URL: http://svn.opensuse.org/viewcvs/yast?rev=62512&view=rev Log: - don't preselect locked patches (bnc#627316) - 2.20.0 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Resolvable_Patches.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=62512&r1=62511&r2=62512&view=diff ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Thu Sep 30 18:26:37 2010 @@ -1 +1 @@ -2.19.1 +2.20.0 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-bindings.changes?rev=62512&r1=62511&r2=62512&view=diff ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Thu Sep 30 18:26:37 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Sep 30 16:23:06 UTC 2010 - lslezak@suse.cz + +- don't preselect locked patches (bnc#627316) +- 2.20.0 + +------------------------------------------------------------------- Wed Apr 21 17:22:31 UTC 2010 - lslezak@suse.cz - reload services rnd epositories after service refresh to avoid Modified: trunk/pkg-bindings/src/Resolvable_Patches.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Patches.cc?rev=62512&r1=62511&r2=62512&view=diff ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Patches.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Patches.cc Thu Sep 30 18:26:37 2010 @@ -95,7 +95,7 @@ y2milestone("Procesing patch %s", (*it)->name().c_str()); zypp::ui::Selectable::Ptr s = *it; - if (s && s->isNeeded()) + if (s && s->isNeeded() && !s->isUnwanted()) { zypp::Patch::constPtr patch = zypp::dynamic_pointer_cast<const zypp::Patch> (s->candidateObj().resolvable()); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org