Author: lslezak Date: Mon Jul 25 11:04:52 2011 New Revision: 64976 URL: http://svn.opensuse.org/viewcvs/yast?rev=64976&view=rev Log: - do not skip package proposal when the partitioner has changed proposed packages - i.e. add snapper packages after switching to btrfs (bnc#704127) - 2.17.85 Modified: branches/SuSE-Code-11-SP2-Branch/packager/VERSION branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP2-Branch/packager/src/clients/software_proposal.ycp branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp Modified: branches/SuSE-Code-11-SP2-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/VERSION?rev=64976&r1=64975&r2=64976&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/VERSION Mon Jul 25 11:04:52 2011 @@ -1 +1 @@ -2.17.84 +2.17.85 Modified: branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes?rev=64976&r1=64975&r2=64976&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes Mon Jul 25 11:04:52 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Jul 25 08:33:29 UTC 2011 - lslezak@suse.cz + +- do not skip package proposal when the partitioner has changed + proposed packages - i.e. add snapper packages after switching to + btrfs (bnc#704127) +- 2.17.85 + +------------------------------------------------------------------- Mon Jun 27 15:45:13 UTC 2011 - lslezak@suse.cz - remove the addon repository after aborting license confirmation Modified: branches/SuSE-Code-11-SP2-Branch/packager/src/clients/software_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/src/clients/software_proposal.ycp?rev=64976&r1=64975&r2=64976&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/src/clients/software_proposal.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/src/clients/software_proposal.ycp Mon Jul 25 11:04:52 2011 @@ -71,7 +71,7 @@ // if only partitioning has been changed just return the current state, // don't reset to default (bnc#450786, bnc#371875) - if (partition_changed && !language_changed && !force_reset) + if (partition_changed && !language_changed && !force_reset && !Packages::PackagesProposalChanged()) { return Packages::Summary ([ `product, `pattern, `selection, `size, `desktop ], false); } Modified: branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp?rev=64976&r1=64975&r2=64976&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp Mon Jul 25 11:04:52 2011 @@ -1751,6 +1751,24 @@ any old_packages_proposal = nil; /** + * Check whether the list of needed packages has been changed since the last + * package proposal + * + * @return boolean true if PackagesProposal has been changed + */ +global boolean PackagesProposalChanged() +{ + any new_packages_proposal = PackagesProposal::GetAllResolvablesForAllTypes(); + + // Force reinit + boolean changed = new_packages_proposal != old_packages_proposal; + y2milestone ("PackagesProposal has been changed: %1", changed); + y2debug("PackagesProposal: %1 -> %2", old_packages_proposal, new_packages_proposal); + + return changed; +} + +/** * Make a proposal for package selection * * @param force reset (fully resets the proposal and creates a new one) @@ -1762,13 +1780,10 @@ // Handle the default desktop DefaultDesktop::Init(); - // If anything has changed - any new_packages_proposal = PackagesProposal::GetAllResolvablesForAllTypes(); - // Force reinit - if (new_packages_proposal != old_packages_proposal) { - y2milestone ("PackagesProposal have changed"); - old_packages_proposal = new_packages_proposal; + if (PackagesProposalChanged()) { + old_packages_proposal = PackagesProposal::GetAllResolvablesForAllTypes(); + y2milestone("Reinit package proposal"); reinit = true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org