Author: lslezak Date: Tue Aug 2 19:27:53 2011 New Revision: 65147 URL: http://svn.opensuse.org/viewcvs/yast?rev=65147&view=rev Log: - set ignoreAlreadyRecommended solver flag by default - make the YaST package management compatible with zypper (bnc#668588) - 2.21.7 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Package.cc trunk/pkg-bindings/src/PkgFunctions.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=65147&r1=65146&r2=65147&view=diff ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Tue Aug 2 19:27:53 2011 @@ -1 +1 @@ -2.21.6 +2.21.7 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=65147&r1=65146&r2=65147&view=diff ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Tue Aug 2 19:27:53 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Aug 2 11:02:34 UTC 2011 - lslezak@suse.cz + +- set ignoreAlreadyRecommended solver flag by default - make the + YaST package management compatible with zypper (bnc#668588) +- 2.21.7 + +------------------------------------------------------------------- Mon Aug 1 09:28:55 UTC 2011 - lslezak@suse.cz - Pkg::SourceFinishAll() - remove upgrading repositories from the Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=65147&r1=65146&r2=65147&view=diff ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Tue Aug 2 19:27:53 2011 @@ -1548,8 +1548,18 @@ try { + // store the current ignoreAlreadyRecommended flag + bool ignore_recommended_bak = zypp_ptr()->resolver()->ignoreAlreadyRecommended(); + // in full distupgrade enable recommended packages - zypper compatibility + y2milestone("Setting ignoreAlreadyRecommended to false"); + zypp_ptr()->resolver()->setIgnoreAlreadyRecommended(false); + // solve upgrade, get statistics zypp_ptr()->resolver()->doUpgrade(); + + // set the original flag + y2milestone("Reverting ignoreAlreadyRecommended to: %s", ignore_recommended_bak ? "true" : "false"); + zypp_ptr()->resolver()->setIgnoreAlreadyRecommended(ignore_recommended_bak); } catch (...) {} Modified: trunk/pkg-bindings/src/PkgFunctions.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgFunctions.cc?rev=65147&r1=65146&r2=65147&view=diff ============================================================================== --- trunk/pkg-bindings/src/PkgFunctions.cc (original) +++ trunk/pkg-bindings/src/PkgFunctions.cc Tue Aug 2 19:27:53 2011 @@ -96,6 +96,10 @@ { y2milestone("Initializing Zypp library..."); zypp_pointer = zypp::getZYpp(); + + // initialize solver flag, be compatible with zypper + zypp_pointer->resolver()->setIgnoreAlreadyRecommended(true); + return zypp_pointer; } catch (const zypp::Exception &excpt) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org