Author: dmacvicar Date: Fri May 23 16:27:25 2008 New Revision: 47847 URL: http://svn.opensuse.org/viewcvs/yast?rev=47847&view=rev Log: fix patch preselection Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/ProvideProcess.cc trunk/pkg-bindings/src/Resolvable_Patches.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=47847&r1=47846&r2=47847&view=diff ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Fri May 23 16:27:25 2008 @@ -1 +1 @@ -2.16.37 +2.16.38 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=47847&r1=47846&r2=47847&view=diff ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Fri May 23 16:27:25 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri May 23 16:25:48 CEST 2008 - dmacvicar@suse.de + +- fix patch pre-selection +- 2.16.38 + +------------------------------------------------------------------- Fri May 23 12:42:04 CEST 2008 - lslezak@suse.cz - do not keep downloaded packages by default (bnc#393709) Modified: trunk/pkg-bindings/src/ProvideProcess.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/ProvideProcess.cc?rev=47847&r1=47846&r2=47847&view=diff ============================================================================== --- trunk/pkg-bindings/src/ProvideProcess.cc (original) +++ trunk/pkg-bindings/src/ProvideProcess.cc Fri May 23 16:27:25 2008 @@ -53,8 +53,10 @@ return true; } - if (!provider.status().isInstalled() - && (!onlyNeeded || provider.isBroken()) ) // take only needed items (e.G. needed patches) + + if (( (!provider.isSatisfied()) && provider.isRelevant() ) + ) + //&& (!onlyNeeded) ) // take only needed items (e.G. needed patches) { // deselect the item if it's already selected, // only one item should be selected Modified: trunk/pkg-bindings/src/Resolvable_Patches.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Patches.cc?rev=47847&r1=47846&r2=47847&view=diff ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Patches.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Patches.cc Fri May 23 16:27:25 2008 @@ -99,10 +99,10 @@ zypp::Patch::constPtr pch = zypp::asKindzypp::Patch(i->resolvable()); std::string name(pch->name()); - y2debug("Procesing patch %s: interactive: %s, affects_pkg_manager: %s, reboot_needed: %s", name.c_str(), + y2debug("Procesing patch %s: interactive: %s, affects_pkg_manager: %s, reboot_neeeded: %s", name.c_str(), pch->interactive() ? "true" : "false", - pch->affects_pkg_manager() ? "true" : "false", - pch->reboot_needed() ? "true" : "false" + pch->restartSuggested() ? "true" : "false", + pch->rebootSuggested() ? "true" : "false" ); // the best patch for the current arch, no preferred version, only needed patches @@ -141,8 +141,8 @@ { if (kind == "all" || (kind == "interactive" && patch->interactive()) - || (kind == "affects_pkg_manager" && patch->affects_pkg_manager()) - || (kind == "reboot_needed" && patch->reboot_needed()) + || (kind == "affects_pkg_manager" && patch->restartSuggested()) + || (kind == "reboot_needed" && patch->rebootSuggested()) ) { // remember the patch @@ -150,12 +150,12 @@ } else { - y2milestone("Patch (id) %s has not required flag", patch->id().c_str()); + y2milestone("Patch %s has not required flag", patch->ident().c_str()); } } else { - y2milestone("Ignoring optional patch (id): %s", patch->id().c_str()); + y2milestone("Ignoring optional patch : %s", patch->ident().c_str()); } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org